diff --git a/metadata/at.h4x.awhip.yml b/metadata/at.h4x.awhip.yml
index 466094b48f..bd69a49b18 100644
--- a/metadata/at.h4x.awhip.yml
+++ b/metadata/at.h4x.awhip.yml
@@ -31,6 +31,10 @@ Builds:
     versionCode: 10100
     commit: a37216e57792bd92dd7b7947429ffa696e1c1b41
     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.blockbasti.justanotherworkouttimer.yml b/metadata/com.blockbasti.justanotherworkouttimer.yml
index 21614453e9..e3453ebeb7 100644
--- a/metadata/com.blockbasti.justanotherworkouttimer.yml
+++ b/metadata/com.blockbasti.justanotherworkouttimer.yml
@@ -221,7 +221,7 @@ Builds:
       - update-alternatives --auto java
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.8.1
+      - flutter@2.10.0
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
diff --git a/metadata/com.coinerella.peercoin.yml b/metadata/com.coinerella.peercoin.yml
index 80feea243f..13f97da733 100644
--- a/metadata/com.coinerella.peercoin.yml
+++ b/metadata/com.coinerella.peercoin.yml
@@ -325,11 +325,15 @@ Builds:
   - versionName: 0.8.3
     versionCode: 80
     commit: 1c93e430f702ba2f5d9f103a727b38d85597a24f
+    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.1
+      - flutter@2.10.0
     rm:
-      - ios/build
+      - ios
       - test_driver
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
     scanignore:
diff --git a/metadata/com.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml
index e27425648f..3bd978a4ec 100644
--- a/metadata/com.emanuelef.remote_capture.yml
+++ b/metadata/com.emanuelef.remote_capture.yml
@@ -326,6 +326,8 @@ Builds:
       - yes
     prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
         'cmake;3.18.1' > /dev/null
+    scandelete:
+      - app/src/main/jni/tests/
     ndk: r23b
 
 MaintainerNotes: Ignored files are the DB-IP country lite db and the DB-IP ASN lite
diff --git a/metadata/com.github.cvzi.darkmodewallpaper.yml b/metadata/com.github.cvzi.darkmodewallpaper.yml
index 780567499a..8da1cc24e5 100644
--- a/metadata/com.github.cvzi.darkmodewallpaper.yml
+++ b/metadata/com.github.cvzi.darkmodewallpaper.yml
@@ -149,9 +149,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.2.3
-    versionCode: 20
-    commit: 981c12f1401049a458d5a499d4bee273741226f2
+  - versionName: 1.2.4
+    versionCode: 21
+    commit: 92862e61a3b877956fb6f32e4736b9939648859d
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -159,6 +159,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    rm:
+      - app/publish.gradle
 
   - versionName: 1.2.4
     versionCode: 21
diff --git a/metadata/com.rechnen.app.yml b/metadata/com.rechnen.app.yml
index 4da92da877..e36384c0cc 100644
--- a/metadata/com.rechnen.app.yml
+++ b/metadata/com.rechnen.app.yml
@@ -56,6 +56,10 @@ Builds:
     versionCode: 8
     commit: 48ed0c98e0f0c2e2821c526467e43ed21b97979e
     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.simplytranslate_mobile.yml b/metadata/com.simplytranslate_mobile.yml
index b180e9066b..eee8cffd86 100644
--- a/metadata/com.simplytranslate_mobile.yml
+++ b/metadata/com.simplytranslate_mobile.yml
@@ -62,9 +62,13 @@ Builds:
   - versionName: 1.1.4
     versionCode: 6
     commit: b7b7cb6eb5311a3a2c31b4452c0603ec7fb57871
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
     srclibs:
-      - flutter@2.5.1
+      - flutter@2.10.0
     rm:
       - .vscode
       - ios
diff --git a/metadata/dev.yasan.metro.fdroid.yml b/metadata/dev.yasan.metro.fdroid.yml
index 4e9848ba45..94587fb600 100644
--- a/metadata/dev.yasan.metro.fdroid.yml
+++ b/metadata/dev.yasan.metro.fdroid.yml
@@ -37,6 +37,7 @@ Builds:
     versionCode: 210
     commit: f396841a1a3d51089d1408dd1e8061b7fb2bad7e
     subdir: app
+    submodules: true
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
diff --git a/metadata/se.leap.bitmaskclient.yml b/metadata/se.leap.bitmaskclient.yml
index c8680148fc..bece320245 100644
--- a/metadata/se.leap.bitmaskclient.yml
+++ b/metadata/se.leap.bitmaskclient.yml
@@ -351,80 +351,23 @@ Builds:
       - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
     ndk: r20b
 
-  - versionName: 1.1.1
-    versionCode: 159
-    disable: invalid submodule
-    commit: 5aaa3bb1c83d486e300eb98876eab26ad4325b82
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
-    gradle:
-      - normalProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
-    scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
-      - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
-
   - versionName: 1.1.2
     versionCode: 160
     commit: 4f23849b79ec0801672ff593a15907a6b1505940
     subdir: app
     submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
     gradle:
       - normalProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
+    rm:
+      - tor-android/external/openssl/fuzz
+      - tor-android/external/openssl/boringssl/fuzz
     scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
+      - lib-bitmask-core*
+      - bitmaskcore/IPtProxy
       - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
+      - tor-android/external
+    build: ../scripts/build_deps.sh
+    ndk: r21e
 
 MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml
index f625bfcb23..7efd1d2c7d 100644
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@@ -185,80 +185,23 @@ Builds:
       - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
     ndk: r20b
 
-  - versionName: 1.1.1
-    versionCode: 159
-    disable: invalid submodule
-    commit: 5aaa3bb1c83d486e300eb98876eab26ad4325b82
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
-    gradle:
-      - customProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
-    scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
-      - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
-
   - versionName: 1.1.2
     versionCode: 160
     commit: 4f23849b79ec0801672ff593a15907a6b1505940
     subdir: app
     submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing golang-go
     gradle:
       - customProductionFat
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' >
-        /dev/null
-      - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle
-      - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts
+    rm:
+      - tor-android/external/openssl/fuzz
+      - tor-android/external/openssl/boringssl/fuzz
     scandelete:
-      - bitmask-core
-      - bitmask-web-core
-      - go/src
+      - lib-bitmask-core*
+      - bitmaskcore/IPtProxy
       - ics-openvpn/main/src/main/cpp
-    build:
-      - cd ../go
-      - export GOPATH="$PWD"
-      - export GO_COMPILED="$PWD/bin"
-      - export PATH="$GO_COMPILED:$PATH"
-      - go get golang.org/x/mobile/cmd/gomobile
-      - gomobile init
-      - mkdir -p ./lib
-      - gomobile bind -target=android -o ./lib/bitmask-web-core.aar se.leap.bitmaskclient/shapeshifter/
-        se.leap.bitmaskclient/pgpverify
-      - cp lib/bitmask-web-core* ../bitmask-web-core/.
-      - gomobile bind -target=android -o ./lib/bitmask-core.aar se.leap.bitmaskclient/shapeshifter/
-      - cp lib/bitmask-core* ../bitmask-core/.
-      - cd ../ics-openvpn
-      - gradle main:externalNativeBuildCleanSkeletonRelease main:externalNativeBuildSkeletonRelease
-    ndk: r20b
+      - tor-android/external
+    build: ../scripts/build_deps.sh
+    ndk: r21e
 
 MaintainerNotes: The "build" commands are extracted from build_deps.sh.