diff --git a/metadata/com.corphish.quicktools.single.yml b/metadata/com.corphish.quicktools.single.yml
new file mode 100644
index 0000000000..e590861a91
--- /dev/null
+++ b/metadata/com.corphish.quicktools.single.yml
@@ -0,0 +1,32 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Avinaba Dalal
+AuthorEmail: d97.avinaba@gmail.com
+SourceCode: https://github.com/corphish/TextTools
+IssueTracker: https://github.com/corphish/TextTools/issues
+
+AutoName: Text Tools
+
+RepoType: git
+Repo: https://github.com/corphish/TextTools
+Binaries: https://github.com/corphish/TextTools/releases/download/v%v/app-release-single.apk
+
+Builds:
+  - versionName: 1.1.0.1
+    versionCode: 11
+    commit: cca5fbc7681a59570ac904f49b9f9c36150f634f
+    subdir: app
+    gradle:
+      - singleOption
+    srclibs:
+      - reproducible-apk-tools@v0.2.4
+    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
+      'META-INF/services/*'
+
+AllowedAPKSigningKeys: c38c54ba54fa6718a56a8ee319cf8291329860ba092290743b7defd813fa9de7
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.0.1
+CurrentVersionCode: 11
diff --git a/metadata/com.corphish.quicktools.yml b/metadata/com.corphish.quicktools.yml
index 47a6c416de..4e183cddb5 100644
--- a/metadata/com.corphish.quicktools.yml
+++ b/metadata/com.corphish.quicktools.yml
@@ -68,24 +68,12 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
       'META-INF/services/*'
 
-  - versionName: 1.1.0
-    versionCode: 10
-    disable: https://github.com/corphish/TextTools/issues/2
-    commit: 1ed1806ebe53cd6a7a7994b4e4b34c1bdedf002b
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - reproducible-apk-tools@v0.2.4
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
-      'META-INF/services/*'
-
   - versionName: 1.1.0.1
     versionCode: 11
     commit: cca5fbc7681a59570ac904f49b9f9c36150f634f
     subdir: app
     gradle:
-      - yes
+      - multipleOptions
     srclibs:
       - reproducible-apk-tools@v0.2.4
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
diff --git a/metadata/com.guozhigq.pilipala.yml b/metadata/com.guozhigq.pilipala.yml
index 66de79e822..6cd6fbaf79 100644
--- a/metadata/com.guozhigq.pilipala.yml
+++ b/metadata/com.guozhigq.pilipala.yml
@@ -736,8 +736,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y gcc-multilib libc-dev make automake pkg-config libtool
-        nasm python3-jsonschema wget
-      - apt-get install -y -t bullseye-backports meson python3-jinja2
+        nasm python3-jsonschema wget meson python3-jinja2 zip
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     srclibs:
       - flutter@stable
@@ -785,7 +784,7 @@ Builds:
       - cp $$media-kit-libmpv-android-video-build$$/output/default-x86_64.jar build/media_kit_libs_android_video/output
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
-    ndk: r25c
+    ndk: 25.2.9519653
 
   - versionName: 1.0.22
     versionCode: 10222
@@ -793,8 +792,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y gcc-multilib libc-dev make automake pkg-config libtool
-        nasm python3-jsonschema wget
-      - apt-get install -y -t bullseye-backports meson python3-jinja2
+        nasm python3-jsonschema wget meson python3-jinja2 zip
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     srclibs:
       - flutter@stable
@@ -843,7 +841,7 @@ Builds:
         build/media_kit_libs_android_video/output
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
-    ndk: r25c
+    ndk: 25.2.9519653
 
   - versionName: 1.0.22
     versionCode: 10223
@@ -851,8 +849,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y gcc-multilib libc-dev make automake pkg-config libtool
-        nasm python3-jsonschema wget
-      - apt-get install -y -t bullseye-backports meson python3-jinja2
+        nasm python3-jsonschema wget meson python3-jinja2 zip
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     srclibs:
       - flutter@stable
@@ -900,7 +897,7 @@ Builds:
       - cp $$media-kit-libmpv-android-video-build$$/output/default-arm64-v8a.jar build/media_kit_libs_android_video/output
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
-    ndk: r25c
+    ndk: 25.2.9519653
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.orgzlyrevived.yml b/metadata/com.orgzlyrevived.yml
index b64806f7c7..cfe4e5d4a1 100644
--- a/metadata/com.orgzlyrevived.yml
+++ b/metadata/com.orgzlyrevived.yml
@@ -64,19 +64,6 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: 1.8.20
-    versionCode: 201
-    disable: https://github.com/orgzly-revived/orgzly-android-revived/issues/233
-    commit: 4892efc71dcfd6918fb0c468680ba7363055f70a
-    subdir: app
-    sudo:
-      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
-      - apt-get update
-      - apt-get install -y -t bullseye openjdk-11-jdk-headless
-      - update-java-alternatives --set java-1.11.0-openjdk-amd64
-    gradle:
-      - fdroid
-
   - versionName: 1.8.21
     versionCode: 202
     commit: 5b64921eb769c8f156843344f65f59a086138414
@@ -88,6 +75,7 @@ Builds:
       - update-java-alternatives --set java-1.11.0-openjdk-amd64
     gradle:
       - fdroid
+    prebuild: echo 1
 
 AllowedAPKSigningKeys: 6fc9c2e22d07d25ce77e2e963455053c38b8318a1a2491b3ed95d50cba85493d
 
diff --git a/metadata/fr.gaulupeau.apps.InThePoche.yml b/metadata/fr.gaulupeau.apps.InThePoche.yml
index 3ba4d3555f..c6bfece930 100644
--- a/metadata/fr.gaulupeau.apps.InThePoche.yml
+++ b/metadata/fr.gaulupeau.apps.InThePoche.yml
@@ -113,6 +113,7 @@ Builds:
 
   - versionName: 1.12.0
     versionCode: 30
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 1.12.0
     subdir: app
     gradle:
@@ -120,6 +121,7 @@ Builds:
 
   - versionName: 1.12.1
     versionCode: 31
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 1.12.1
     subdir: app
     gradle:
@@ -127,6 +129,7 @@ Builds:
 
   - versionName: 1.12.2
     versionCode: 32
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 1.12.2
     subdir: app
     gradle:
@@ -134,6 +137,7 @@ Builds:
 
   - versionName: 2.0.0
     versionCode: 104
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.0.0
     subdir: app
     gradle:
@@ -141,6 +145,7 @@ Builds:
 
   - versionName: 2.0.1
     versionCode: 105
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.0.1
     subdir: app
     gradle:
@@ -148,6 +153,7 @@ Builds:
 
   - versionName: 2.0.2
     versionCode: 106
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.0.2
     subdir: app
     gradle:
@@ -155,6 +161,7 @@ Builds:
 
   - versionName: 2.1.0
     versionCode: 109
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.1.0
     subdir: app
     gradle:
@@ -162,6 +169,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 210
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.2.0
     subdir: app
     gradle:
@@ -169,6 +177,7 @@ Builds:
 
   - versionName: 2.2.1
     versionCode: 211
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.2.1
     subdir: app
     gradle:
@@ -176,6 +185,7 @@ Builds:
 
   - versionName: 2.2.2
     versionCode: 212
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.2.2
     subdir: app
     gradle:
@@ -183,6 +193,7 @@ Builds:
 
   - versionName: 2.2.3
     versionCode: 213
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.2.3
     subdir: app
     gradle:
@@ -190,6 +201,7 @@ Builds:
 
   - versionName: 2.2.4
     versionCode: 214
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.2.4
     subdir: app
     gradle:
@@ -197,6 +209,7 @@ Builds:
 
   - versionName: 2.3.0
     versionCode: 219
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.3.0
     subdir: app
     gradle:
@@ -204,6 +217,7 @@ Builds:
 
   - versionName: 2.4.0-beta.1
     versionCode: 220
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.4.0-beta.1
     subdir: app
     gradle:
@@ -211,6 +225,7 @@ Builds:
 
   - versionName: 2.4.0-beta.6
     versionCode: 225
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.4.0-beta.6
     subdir: app
     gradle:
@@ -218,6 +233,7 @@ Builds:
 
   - versionName: 2.4.0
     versionCode: 226
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.4.0
     subdir: app
     gradle:
@@ -225,6 +241,7 @@ Builds:
 
   - versionName: 2.4.1
     versionCode: 227
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.4.1
     subdir: app
     gradle:
@@ -232,6 +249,7 @@ Builds:
 
   - versionName: 2.4.2
     versionCode: 228
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 2.4.2
     subdir: app
     gradle:
@@ -239,6 +257,7 @@ Builds:
 
   - versionName: 2.4.3
     versionCode: 229
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: e44ae1b36a8859fef09ae049ec981f3e93edfe17
     subdir: app
     gradle:
@@ -246,6 +265,7 @@ Builds:
 
   - versionName: 2.5.0
     versionCode: 230
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 79ffcbdc939f0b8c313d43cad795693bfc25f097
     subdir: app
     sudo:
@@ -257,6 +277,7 @@ Builds:
 
   - versionName: 2.5.1
     versionCode: 231
+    disable: https://github.com/wallabag/android-app/issues/1399
     commit: 4fcb9fb2d8731e563719a3dc395c8284f6121856
     subdir: app
     sudo:
@@ -266,14 +287,7 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.5.2
-    versionCode: 232
-    commit: fb57893578d2db978c1790cd1a3952379c72f4e8
-    subdir: app
-    gradle:
-      - yes
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v?[0-9.]*$
+AutoUpdateMode: None
+UpdateCheckMode: None
 CurrentVersion: 2.5.2
 CurrentVersionCode: 232
diff --git a/metadata/io.jozo.prayerbook.yml b/metadata/io.jozo.prayerbook.yml
index 33acd87be9..17e38a1fcc 100644
--- a/metadata/io.jozo.prayerbook.yml
+++ b/metadata/io.jozo.prayerbook.yml
@@ -61,6 +61,7 @@ Builds:
 
   - versionName: 0.2.0
     versionCode: 4
+    disable: https://codeberg.org/jozo/prayer-book/issues/7
     commit: 8bf805bb1fefde055006e40bb3f6ab2452cac2ea
     subdir: android/app
     sudo:
diff --git a/metadata/net.vonforst.evmap.yml b/metadata/net.vonforst.evmap.yml
index 687667b49a..e52b608c28 100644
--- a/metadata/net.vonforst.evmap.yml
+++ b/metadata/net.vonforst.evmap.yml
@@ -656,6 +656,7 @@ Builds:
 
   - versionName: 1.8.2
     versionCode: 212
+    disable: https://github.com/ev-map/EVMap/issues/197
     commit: 45de4c8ff0da7d0458a53397beefb0566eb26e4b
     subdir: app
     gradle:
diff --git a/metadata/org.koreader.launcher.fdroid.yml b/metadata/org.koreader.launcher.fdroid.yml
index 553c7a274d..f7d53dea1a 100644
--- a/metadata/org.koreader.launcher.fdroid.yml
+++ b/metadata/org.koreader.launcher.fdroid.yml
@@ -8,6 +8,8 @@ Translation: https://hosted.weblate.org/engage/koreader/
 Changelog: https://github.com/koreader/koreader/releases
 Liberapay: KOReader
 
+AutoName: KOReader
+
 RepoType: git
 Repo: https://github.com/koreader/koreader.git
 
@@ -1126,9 +1128,12 @@ Builds:
     commit: v2024.04
     submodules: true
     sudo:
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
       - apt-get update
       - apt-get install -y make gcc-multilib luarocks ragel python-is-python3 wget
         cmake autoconf automake libtool pkg-config nasm gettext libtool-bin libncurses5
+      - apt-get install -y -t bullseye openjdk-11-jdk-headless
+      - update-java-alternatives --set java-1.11.0-openjdk-amd64
     output: koreader-android-*.apk
     rm:
       - platform/ubuntu-touch/
@@ -1146,9 +1151,12 @@ Builds:
     commit: v2024.04
     submodules: true
     sudo:
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
       - apt-get update
       - apt-get install -y make gcc-multilib luarocks ragel python-is-python3 wget
         cmake autoconf automake libtool pkg-config nasm gettext libtool-bin libncurses5
+      - apt-get install -y -t bullseye openjdk-11-jdk-headless
+      - update-java-alternatives --set java-1.11.0-openjdk-amd64
     output: koreader-android-*.apk
     rm:
       - platform/ubuntu-touch/
@@ -1167,9 +1175,12 @@ Builds:
     commit: v2024.04
     submodules: true
     sudo:
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
       - apt-get update
       - apt-get install -y make gcc-multilib luarocks ragel python-is-python3 wget
         cmake autoconf automake libtool pkg-config nasm gettext libtool-bin libncurses5
+      - apt-get install -y -t bullseye openjdk-11-jdk-headless
+      - update-java-alternatives --set java-1.11.0-openjdk-amd64
     output: koreader-android-*.apk
     rm:
       - platform/ubuntu-touch/