diff --git a/metadata/com.dev.xavier.tempusromanum.yml b/metadata/com.dev.xavier.tempusromanum.yml
index ca1bc57ec9..823a115374 100644
--- a/metadata/com.dev.xavier.tempusromanum.yml
+++ b/metadata/com.dev.xavier.tempusromanum.yml
@@ -79,6 +79,10 @@ Builds:
     versionCode: 231
     commit: f574e9765461aac638688a629313c6d99858a090
     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.ghostsq.commander.yml b/metadata/com.ghostsq.commander.yml
index 681d342b21..1c09ede086 100644
--- a/metadata/com.ghostsq.commander.yml
+++ b/metadata/com.ghostsq.commander.yml
@@ -557,6 +557,18 @@ Builds:
     scanignore:
       - src/main/java/com/ghostsq/commander/adapters/CA.java
 
+  - versionName: 1.60.6b1
+    versionCode: 425
+    commit: '76'
+    gradle:
+      - free
+    prebuild:
+      - sed -i -e '/task clean/,/^}/d' build.gradle.root
+      - cat build.gradle >> build.gradle.root
+      - mv build.gradle.root build.gradle
+    scanignore:
+      - src/main/java/com/ghostsq/commander/adapters/CA.java
+
 MaintainerNotes: |-
     No commit messages in source repo! No tags. Apks on website can be used to
     confirm a release is real. Commit where AndroidManifest is changed usually
diff --git a/metadata/com.simplytranslate.yml b/metadata/com.simplytranslate.yml
index 7cbfc5318a..f4f96dd7bb 100644
--- a/metadata/com.simplytranslate.yml
+++ b/metadata/com.simplytranslate.yml
@@ -34,7 +34,7 @@ Builds:
     commit: b172f22618b8339380ae53f74bc3525d2691b417
     output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
     srclibs:
-      - flutter@2.2.3
+      - flutter@2.5.1
     rm:
       - .vscode
       - ios
diff --git a/metadata/com.waist.line.yml b/metadata/com.waist.line.yml
index 651192c137..a273252117 100644
--- a/metadata/com.waist.line.yml
+++ b/metadata/com.waist.line.yml
@@ -331,156 +331,21 @@ Builds:
       - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
         libs/barcodescanner-release-2.1.5.aar
 
-  - versionName: 3.0.2
-    versionCode: 30002
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: 3.0.2
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.0
-    versionCode: 30100
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: a30692499495d301657957141ddb1ec34c575dcd
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.1
-    versionCode: 30101
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: c3cc69985fd785b813e8ac34ef2d816199f7f620
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.3
-    versionCode: 30103
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: 54509704866f9d9e49872e171260a1a334b9a75f
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.4
-    versionCode: 30104
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: 884cbe72aad0c17e21c101e0c957692b9d459c6a
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.5
-    versionCode: 30105
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: e1a87429b53c0d5d722631220589ba424ff0b6ad
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
-  - versionName: 3.1.6
-    versionCode: 30106
-    disable: https://github.com/davidhealey/waistline/issues/293
-    commit: 1bd0922b7dfe588170ac5e00e9ca89a2f6882464
-    subdir: platforms/android/app
-    gradle:
-      - yes
-    srclibs:
-      - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
-    rm:
-      - platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-    prebuild: sed -i -e '/gradleVersion/d' build.gradle
-    build:
-      - pushd $$BarcodeScanner$$
-      - rm local.properties
-      - gradle clean assembleRelease
-      - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        libs/barcodescanner-release-2.1.5.aar
-
   - versionName: 3.1.7
     versionCode: 30107
     commit: 44ddec1b74d858dc97eb8f8ead0e1e10147dbc8d
     sudo:
-      - apt-get update || apt-get update
-      - apt-get install -t testing zlib1g nodejs npm
+      - 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
+      - echo "db18c54ebe01974d46198b08729249acbb0dcdc9aea82b53eec913f8c56035c6 node.tar.xz"
+        | sha256sum -c -
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm install -g cordova
     output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
     srclibs:
       - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c
+    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
+        > /dev/null
     build:
       - npm install
       - cordova platform add android
@@ -490,9 +355,9 @@ Builds:
       - popd
       - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
         platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-      - cordova build android --release
+      - cordova build android --release -- --packageType=apk
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.4.2
-CurrentVersionCode: 20402
+CurrentVersion: 3.1.7
+CurrentVersionCode: 30107
diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml
index 182bf25f0c..0d1e7e9a29 100644
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@@ -1032,11 +1032,10 @@ Builds:
 
   - versionName: 16.0.0.0
     versionCode: 1802
+    disable: https://github.com/MarcusWolschon/osmeditor4android/issues/1459
     commit: 73911f0bf29adc1a22634cf0e433e9592f8a1475
     gradle:
       - current
-    prebuild: sed -i -e '/bintray/d' -e '/preset-utils/d' -e "/'ch.poole.gradle.markdow/d"
-        -e '/markdownToHtml {/,+6d'  -e '/markdownToHtmlRtl(/,+7d' build.gradle
     scanignore:
       - src/main/assets/synonyms/synonyms.so
     scandelete:
diff --git a/metadata/es.ideotec.workouttime.yml b/metadata/es.ideotec.workouttime.yml
index fe923155cb..ca90575532 100644
--- a/metadata/es.ideotec.workouttime.yml
+++ b/metadata/es.ideotec.workouttime.yml
@@ -178,7 +178,7 @@ Builds:
     commit: 766ae921dfc866db696b65a0d85a1abd023d19b8
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.0.5
+      - flutter@2.5.1
     rm:
       - ios
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
diff --git a/metadata/eu.roggstar.luigithehunter.dsaassistent.yml b/metadata/eu.roggstar.luigithehunter.dsaassistent.yml
index 1a4db4bd5a..ef51623032 100644
--- a/metadata/eu.roggstar.luigithehunter.dsaassistent.yml
+++ b/metadata/eu.roggstar.luigithehunter.dsaassistent.yml
@@ -61,6 +61,10 @@ Builds:
     versionCode: 60
     commit: f7f12d5f955ad6948abe2c3b02b372d8c057694b
     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/fr.corenting.traficparis.yml b/metadata/fr.corenting.traficparis.yml
index 77053ce030..a51b28deba 100644
--- a/metadata/fr.corenting.traficparis.yml
+++ b/metadata/fr.corenting.traficparis.yml
@@ -66,6 +66,10 @@ Builds:
     versionCode: 25
     commit: 56a5750750f9fd0641b59d9bd73eddc6bd0d8005
     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/me.echeung.moemoekyun.fdroid.yml b/metadata/me.echeung.moemoekyun.fdroid.yml
index 31f2209ccb..d29e543de3 100644
--- a/metadata/me.echeung.moemoekyun.fdroid.yml
+++ b/metadata/me.echeung.moemoekyun.fdroid.yml
@@ -234,6 +234,10 @@ Builds:
     versionCode: 96
     commit: a8a967ad248f4e16e898be351cd357c19154cf77
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml
index 521b0a4842..ad0fe133b5 100644
--- a/metadata/net.bible.android.activity.yml
+++ b/metadata/net.bible.android.activity.yml
@@ -884,9 +884,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 4.0.608
-    versionCode: 608
-    commit: fa7acf841b54913ce15d5aa65c4f0826c55fd45e
+  - versionName: 4.0.610
+    versionCode: 610
+    commit: db3c134ee297ed7d6ea077739c08dbfb695967e7
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -903,5 +903,5 @@ Builds:
 
 AutoUpdateMode: Version v%v-fdroid
 UpdateCheckMode: Tags ^v\d+\.\d+\.\d+-fdroid$
-CurrentVersion: 4.0.608
-CurrentVersionCode: 608
+CurrentVersion: 4.0.610
+CurrentVersionCode: 610
diff --git a/metadata/org.totschnig.myexpenses.yml b/metadata/org.totschnig.myexpenses.yml
index 92dac71237..f9d7c6c230 100644
--- a/metadata/org.totschnig.myexpenses.yml
+++ b/metadata/org.totschnig.myexpenses.yml
@@ -1647,6 +1647,10 @@ Builds:
     versionCode: 499
     commit: 29129e3cc04b11339b8a76f992a19ac15a67667f
     subdir: myExpenses
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/outputs/universal_apk/conscriptExternRelease/myExpenses-conscript-extern-release-universal-unsigned.apk
     rm:
       - mlkit