diff --git a/metadata/com.LAPARCELA.nihonoari.yml b/metadata/com.LAPARCELA.nihonoari.yml
index aea2e35f7f..6b02b8d06c 100644
--- a/metadata/com.LAPARCELA.nihonoari.yml
+++ b/metadata/com.LAPARCELA.nihonoari.yml
@@ -31,7 +31,7 @@ Builds:
     commit: v1.3.0
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
-      - flutter@v1.15.21
+      - flutter@2.5.3
     prebuild:
       - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
         -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
diff --git a/metadata/com.asdoi.timetable.yml b/metadata/com.asdoi.timetable.yml
index 5f965e2b53..4240b276b6 100644
--- a/metadata/com.asdoi.timetable.yml
+++ b/metadata/com.asdoi.timetable.yml
@@ -60,6 +60,10 @@ Builds:
     versionCode: 16
     commit: a5df44568cf786a1610a01f1b1a8f33c9ce4cd87
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.in.my.district.yml b/metadata/com.in.my.district.yml
index 5ba5d6ffa5..c80c5045e9 100644
--- a/metadata/com.in.my.district.yml
+++ b/metadata/com.in.my.district.yml
@@ -133,7 +133,6 @@ Builds:
   - versionName: 1.2.16
     versionCode: 10216
     commit: 208e76c1b93ed9beba2a03954e18c28b70f92ea1
-    subdir: platforms/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
       - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.4/node-v14.17.4-linux-x64.tar.xz
@@ -141,14 +140,13 @@ Builds:
         | sha256sum -c -
       - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm install -g cordova
-    gradle:
-      - yes
+    output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
     prebuild:
-      - cd ../../..
-      - rm -rf platforms
+      - npm install
       - cordova platform add android
     scandelete:
       - node_modules
+    build: cordova build android --release -- --packageType=apk
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.kmac5dev.mindfulnotifier.yml b/metadata/com.kmac5dev.mindfulnotifier.yml
index 24dc162319..f74bc026cd 100644
--- a/metadata/com.kmac5dev.mindfulnotifier.yml
+++ b/metadata/com.kmac5dev.mindfulnotifier.yml
@@ -181,20 +181,13 @@ Builds:
       - $$flutter$$/bin/flutter pub get
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.0.20
-    versionCode: 39
-    commit: e750467e992a771c7854f73a2755d6d59275b5af
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.5.3
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 1.0.21
     versionCode: 40
     commit: b08906c2c1430b9fb2fda7f3a6ed7a01d2841080
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.5.3
diff --git a/metadata/io.kubenav.kubenav.yml b/metadata/io.kubenav.kubenav.yml
index ffe3e6d04a..467c6e12f1 100644
--- a/metadata/io.kubenav.kubenav.yml
+++ b/metadata/io.kubenav.kubenav.yml
@@ -417,6 +417,8 @@ Builds:
       - ionic build
       - npx cap sync android
       - rm -rf node_modules/node-notifier
+    scandelete:
+      - node_modules/@capacitor/cli/assets/*.tar.gz
     build:
       - mkdir ~/go
       - export GOROOT=/usr/local/go
diff --git a/metadata/net.ivpn.client.yml b/metadata/net.ivpn.client.yml
index a0ff553f7a..e4bfad9118 100644
--- a/metadata/net.ivpn.client.yml
+++ b/metadata/net.ivpn.client.yml
@@ -31,6 +31,7 @@ Builds:
 
   - versionName: 2.8.0
     versionCode: 107
+    disable: https://github.com/ivpn/android-app/issues/110
     commit: 269471f5b30659522a3496e7c268d38d6250c2b0
     subdir: fdroid
     submodules: true
diff --git a/metadata/pan.alexander.tordnscrypt.stable.yml b/metadata/pan.alexander.tordnscrypt.stable.yml
index 565bd24040..b4a73c115c 100644
--- a/metadata/pan.alexander.tordnscrypt.stable.yml
+++ b/metadata/pan.alexander.tordnscrypt.stable.yml
@@ -135,9 +135,13 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y autogen g++ openjdk-11-jdk-headless
+      - apt-get install -y autogen g++
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
-      - apt-get install -y -t testing golang-go
+      - curl -Lso go.tar.gz https://golang.org/dl/go1.17.3.linux-amd64.tar.gz
+      - echo "550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c go.tar.gz"
+        | sha256sum -c -
+      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
     init:
       - sed -i -e "s/ndkVersion .*/ndkVersion '20.1.5948944'/" build.gradle
       - libs/prebuild