diff --git a/metadata/com.infomaniak.drive.yml b/metadata/com.infomaniak.drive.yml
index 783d6ada90..a2b8aff05f 100644
--- a/metadata/com.infomaniak.drive.yml
+++ b/metadata/com.infomaniak.drive.yml
@@ -167,33 +167,9 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: 4.0.29
-    versionCode: 40002902
-    disable: https://github.com/Infomaniak/android-kDrive/issues/265
-    commit: 9cd49975bd7da1f2f46ea2a69d168e9c712816a8
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-
-  - versionName: 4.0.29
-    versionCode: 40002903
-    commit: 5f503dbca9af736cc3db14e15d3d86ad8d8fb04c
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-
   - versionName: 4.0.30
     versionCode: 40003004
+    disable: https://github.com/Infomaniak/android-kDrive/issues/265
     commit: 94b16f52da9af04a9b3b7437251f97532481e025
     subdir: app
     submodules: true
diff --git a/metadata/com.mendhak.gpslogger.yml b/metadata/com.mendhak.gpslogger.yml
index bb1e8d9549..26cba65b42 100644
--- a/metadata/com.mendhak.gpslogger.yml
+++ b/metadata/com.mendhak.gpslogger.yml
@@ -100,11 +100,13 @@ Builds:
     versionCode: 117
     commit: bd918c1bc83bb623d020ab369569bc18dc308e55
     subdir: gpslogger
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
-MaintainerNotes: No longer using Google Play services.
-
 AutoUpdateMode: Version v%c
 UpdateCheckMode: Tags ^v[.0-9]*$
 CurrentVersion: '117'
diff --git a/metadata/com.smartpack.busyboxinstaller.yml b/metadata/com.smartpack.busyboxinstaller.yml
index 81f0c63b2f..d2244bb447 100644
--- a/metadata/com.smartpack.busyboxinstaller.yml
+++ b/metadata/com.smartpack.busyboxinstaller.yml
@@ -110,13 +110,17 @@ Builds:
     versionCode: 17
     commit: 129457cf4f3215a47b7bce9e2dc94401d0b998e3
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     srclibs:
-      - ndk-box-kitchen@8e189fc6c7de27ae7a27b6150f39136355bf4477
-      - Busybox@1_32_1
+      - ndk-box-kitchen@87ca6f75aad8a1f4d12857d994ea15b33b31a8b4
+      - Busybox@1_33_1
       - SELinux@3.2
-      - pcre@android-mainline-11.0.0_r6
+      - pcre@android-mainline-11.0.0_r44
     scandelete:
       - app/src/main/assets
     build:
diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml
index 41aafec9c0..182bf25f0c 100644
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@@ -1041,6 +1041,9 @@ Builds:
       - src/main/assets/synonyms/synonyms.so
     scandelete:
       - src/androidTest/resources/fixtures/military.zip
+      - src/androidTest/resources/fixtures/military2.zip
+
+MaintainerNotes: synonyms.so is a translation file for Somali.
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9]+\.[0-9]+\.[0-9]+\.0$
diff --git a/metadata/de.christinecoenen.code.zapp.yml b/metadata/de.christinecoenen.code.zapp.yml
index c14afd7b9e..61be528591 100644
--- a/metadata/de.christinecoenen.code.zapp.yml
+++ b/metadata/de.christinecoenen.code.zapp.yml
@@ -322,6 +322,10 @@ Builds:
     versionCode: 48
     commit: 8401fb3fc8302435b5450967858963f6218cfaf5
     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.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml
index 79bc8dde6c..abe8f05ac2 100644
--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@@ -461,6 +461,7 @@ Builds:
 
   - versionName: 3.7.7
     versionCode: 362
+    disable: kotlin.KotlinNullPointerException
     commit: ad24f185f9d00155808a3fd03fc0fac115276595
     subdir: stopcovid
     submodules: true
diff --git a/metadata/org.hlwd.bible_multi_the_life.yml b/metadata/org.hlwd.bible_multi_the_life.yml
index 7f697a1e1e..751ffe1e42 100644
--- a/metadata/org.hlwd.bible_multi_the_life.yml
+++ b/metadata/org.hlwd.bible_multi_the_life.yml
@@ -169,13 +169,13 @@ Builds:
   - versionName: 1.11.0
     versionCode: 20210923
     commit: a6c38a534db3eabfeb068e06ca050be8f277fce2
-    output: build/app/outputs/apk/release/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@v1.16.3
-    prebuild:
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-      - $$flutter$$/bin/flutter pub get
+      - flutter@2.5.1
+    rm:
+      - ios
+      - macos
+      - test
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
diff --git a/metadata/org.runnerup.free.yml b/metadata/org.runnerup.free.yml
index 43046015a1..8b2a14799e 100644
--- a/metadata/org.runnerup.free.yml
+++ b/metadata/org.runnerup.free.yml
@@ -273,12 +273,17 @@ Builds:
     versionCode: 15000306
     commit: a4357460a8234b2ab704c1b4cf22c5954dc287f9
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - latest
     rm:
       - wear
       - ANT-Android-SDKs
-    prebuild: sed -i -e '/play-services/d' build.gradle
+    prebuild: sed -i -e '/play-services/d' -e '/mapboxsdk/d' -e '/api.mapbox.com/d'
+        build.gradle
 
 MaintainerNotes: This replaces RunnerUp 1.x https://f-droid.org/packages/org.runnerup