diff --git a/metadata/com.hanntech.free2pass.yml b/metadata/com.hanntech.free2pass.yml
index 652cb216b4..b0693af955 100644
--- a/metadata/com.hanntech.free2pass.yml
+++ b/metadata/com.hanntech.free2pass.yml
@@ -76,22 +76,6 @@ Builds:
       - $$flutter$$/bin/flutter build apk --flavor fdroid -t lib/entrypoints/fdroid.entrypoint.dart
         --no-sound-null-safety
 
-  - versionName: 1.4.10
-    versionCode: 34
-    commit: aa53833256b14e27bda1108dff9d3b5b2313801f
-    subdir: android/app
-    output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
-    srclibs:
-      - flutter@2.2.0
-    rm:
-      - ios
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk --flavor fdroid -t lib/entrypoints/fdroid.entrypoint.dart
-        --no-sound-null-safety
-
   - versionName: 1.4.12
     versionCode: 36
     commit: 672df359f27f9a567d6c8052052e59570e91228e
diff --git a/metadata/com.junjunguo.pocketmaps.yml b/metadata/com.junjunguo.pocketmaps.yml
index 6366ca8d2a..ff3f95f937 100644
--- a/metadata/com.junjunguo.pocketmaps.yml
+++ b/metadata/com.junjunguo.pocketmaps.yml
@@ -121,6 +121,7 @@ Builds:
     subdir: PocketMaps/app
     gradle:
       - yes
+    ndk: r21
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml
index bdda24a3c2..36ba9559d8 100644
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@@ -1054,31 +1054,9 @@ Builds:
       - popd
     ndk: r23
 
-  - versionName: 24.2.0
-    versionCode: 70
-    commit: 002417b02f59639f2225e8dbdab1b8415db8b229
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v15.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r23
-
   - versionName: 24.3.0
     versionCode: 71
-    commit: 07d7f272ea201856d0604f9775183316300d104d
+    commit: 3c84a55ce7087917e3b640f47fd4ee1ff1346e21
     subdir: app
     sudo:
       - apt-get update || apt-get update
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 7ccdb853cf..7dbfbbc2ef 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -2108,7 +2108,7 @@ Builds:
 
   - versionName: 37.2.0
     versionCode: 192
-    commit: 7d46388586a425829882c220f00e6c8efff67c28
+    commit: 7b8ca360b5cf8a35080c4be83bf6b7922c2c4eb6
     subdir: app
     sudo:
       - apt-get update || apt-get update
diff --git a/metadata/dev.linwood.butterfly.yml b/metadata/dev.linwood.butterfly.yml
index 7dc83e65bb..c88f8bcb15 100644
--- a/metadata/dev.linwood.butterfly.yml
+++ b/metadata/dev.linwood.butterfly.yml
@@ -120,6 +120,10 @@ Builds:
     versionCode: 10
     commit: f958a170213ce84326d8bd0baa0b85482030c9a6
     subdir: app
+    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.8.0
diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml
index 829673bc46..bd4ed80a30 100644
--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@@ -497,6 +497,7 @@ Builds:
 
   - versionName: 4.0.3
     versionCode: 434
+    disable: NullSafeMutableLiveData
     commit: b7e5457155f63b01cf38a1bab3013629dae4aac7
     subdir: stopcovid
     submodules: true
diff --git a/metadata/nekox.messenger.yml b/metadata/nekox.messenger.yml
index e60c10ee29..7b1aa5a829 100644
--- a/metadata/nekox.messenger.yml
+++ b/metadata/nekox.messenger.yml
@@ -779,9 +779,9 @@ Builds:
       - git gc --prune=now
     ndk: r21e
 
-  - versionName: 8.3.0
-    versionCode: 505
-    commit: 6e60b3ab64bf6e124396b057c2cd897817100076
+  - versionName: 8.3.1
+    versionCode: 510
+    commit: d0bf83478671af90cb372c1b6ecdbd22f2ce4cfe
     timeout: 10800
     subdir: TMessagesProj
     submodules: true
diff --git a/metadata/net.moasdawiki.app.yml b/metadata/net.moasdawiki.app.yml
index e26482c78b..94a485c5e4 100644
--- a/metadata/net.moasdawiki.app.yml
+++ b/metadata/net.moasdawiki.app.yml
@@ -99,6 +99,10 @@ Builds:
     versionCode: 28
     commit: 81c00ef2da0ae9ab667e78b8140c4d9725cc3107
     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/org.atalk.android.yml b/metadata/org.atalk.android.yml
index a66f35629c..26b6f5335d 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1574,6 +1574,7 @@ Builds:
 
   - versionName: 2.8.0
     versionCode: 208000
+    disable: https://github.com/cmeng-git/atalk-android/issues/185
     commit: cd3069568236ab593f4001a9c2b4649b7504eace
     subdir: aTalk
     gradle:
diff --git a/metadata/org.paladyn.mediclog.yml b/metadata/org.paladyn.mediclog.yml
index 68a27ae94e..15c30228ee 100644
--- a/metadata/org.paladyn.mediclog.yml
+++ b/metadata/org.paladyn.mediclog.yml
@@ -103,6 +103,7 @@ Builds:
 
   - versionName: 0.2.11
     versionCode: 15
+    disable: https://github.com/JohnLines/mediclog/issues/28
     commit: eb10ad5b309a16b307a088807ad97625a9fa4b05
     subdir: app
     sudo:
diff --git a/metadata/sushi.hardcore.droidfs.yml b/metadata/sushi.hardcore.droidfs.yml
index 27f67872bd..b61d8aabe4 100644
--- a/metadata/sushi.hardcore.droidfs.yml
+++ b/metadata/sushi.hardcore.droidfs.yml
@@ -178,7 +178,7 @@ Builds:
       - OPENSSL_PATH="$$OpenSSL$$" ./build.sh
       - cd ../ffmpeg
       - ./build.sh $$FFmpeg$$
-    ndk: r23
+    ndk: r23b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags