diff --git a/metadata/com.kabouzeid.gramophone.yml b/metadata/com.kabouzeid.gramophone.yml
index ebaf980bb9..239ffa4e1d 100644
--- a/metadata/com.kabouzeid.gramophone.yml
+++ b/metadata/com.kabouzeid.gramophone.yml
@@ -24,6 +24,7 @@ Repo: https://github.com/kabouzeid/Phonograph
 Builds:
   - versionName: 1.2.0
     versionCode: 167
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.2.0
     subdir: app
     gradle:
@@ -33,6 +34,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 170
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.3.0
     subdir: app
     gradle:
@@ -42,6 +44,7 @@ Builds:
 
   - versionName: 1.3.2
     versionCode: 176
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.3.2
     subdir: app
     gradle:
@@ -51,6 +54,7 @@ Builds:
 
   - versionName: 1.3.3
     versionCode: 177
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.3.3
     subdir: app
     gradle:
@@ -60,6 +64,7 @@ Builds:
 
   - versionName: 1.3.4
     versionCode: 178
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.3.4
     subdir: app
     gradle:
@@ -67,12 +72,13 @@ Builds:
 
   - versionName: 1.3.5
     versionCode: 179
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.anjlab.android.iab.v3
     commit: v1.3.5
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 1.3.5
 CurrentVersionCode: 179
diff --git a/metadata/com.spicychair.weather.yml b/metadata/com.spicychair.weather.yml
index a1470f6dac..3510ba23eb 100644
--- a/metadata/com.spicychair.weather.yml
+++ b/metadata/com.spicychair.weather.yml
@@ -16,6 +16,7 @@ Repo: https://github.com/SpicyChair/pluvia_weather_flutter
 Builds:
   - versionName: 1.4.3
     versionCode: 24
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, geolocator
     commit: v1.4.3-fix1
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -28,6 +29,7 @@ Builds:
 
   - versionName: 1.4.4
     versionCode: 25
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, geolocator
     commit: 516683ab0f970c3ae294b471b60e27cb8a6f8d0b
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -40,6 +42,7 @@ Builds:
 
   - versionName: 1.4.5
     versionCode: 28
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, geolocator
     commit: 15d003ba98fe6916477b3092df76f13e9abd10f0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -82,6 +85,7 @@ Builds:
 
   - versionName: 1.4.7
     versionCode: 34
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, geolocator
     commit: 8dfd42e753eef496e96ac44bd3812eceb64b2382
     sudo:
       - apt-get update || apt-get update
@@ -98,6 +102,7 @@ Builds:
 
   - versionName: 1.5.0
     versionCode: 36
+    disable: https://github.com/SpicyChair/pluvia_weather_flutter/issues/55
     commit: a8986d5a4f07e650c2f18223229ce18bfd7875d8
     sudo:
       - apt-get update || apt-get update
@@ -112,7 +117,7 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 1.5.0
diff --git a/metadata/de.micmun.android.nextcloudcookbook.yml b/metadata/de.micmun.android.nextcloudcookbook.yml
index c95a9a2ef7..0184855e84 100644
--- a/metadata/de.micmun.android.nextcloudcookbook.yml
+++ b/metadata/de.micmun.android.nextcloudcookbook.yml
@@ -16,6 +16,7 @@ Repo: https://codeberg.org/MicMun/nextcloud-cookbook.git
 Builds:
   - versionName: 1.2.0
     versionCode: 120
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v1.2.0
     subdir: app
     gradle:
@@ -23,6 +24,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 130
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v1.3.0
     subdir: app
     gradle:
@@ -30,6 +32,7 @@ Builds:
 
   - versionName: 1.4.0
     versionCode: 140
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v1.4.0
     subdir: app
     gradle:
@@ -37,6 +40,7 @@ Builds:
 
   - versionName: 2.0.0
     versionCode: 200
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.0.0
     subdir: app
     gradle:
@@ -44,6 +48,7 @@ Builds:
 
   - versionName: 2.0.1
     versionCode: 201
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.0.1
     subdir: app
     gradle:
@@ -51,6 +56,7 @@ Builds:
 
   - versionName: 2.1.0
     versionCode: 210
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.1.0
     subdir: app
     gradle:
@@ -58,6 +64,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 220
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.2.0
     subdir: app
     gradle:
@@ -65,6 +72,7 @@ Builds:
 
   - versionName: 2.3.0
     versionCode: 230
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.3.0
     subdir: app
     gradle:
@@ -72,6 +80,7 @@ Builds:
 
   - versionName: 2.3.1
     versionCode: 231
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.3.1
     subdir: app
     gradle:
@@ -79,6 +88,7 @@ Builds:
 
   - versionName: 2.3.2
     versionCode: 232
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: v2.3.2
     subdir: app
     gradle:
@@ -86,6 +96,7 @@ Builds:
 
   - versionName: 2.4.1
     versionCode: 241
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 5bf9888401d484c45c87ff4bce7c2bbb9ed15186
     subdir: app
     sudo:
@@ -97,6 +108,7 @@ Builds:
 
   - versionName: 2.4.2
     versionCode: 242
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 09bd0e2fc42b72a2d631965be4869bc3bf33412e
     subdir: app
     sudo:
@@ -108,6 +120,7 @@ Builds:
 
   - versionName: 2.5.0
     versionCode: 250
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: c6cb1f10ae3e6ee494a000de6dc5d87a4ad9eeb4
     subdir: app
     sudo:
@@ -119,6 +132,7 @@ Builds:
 
   - versionName: 2.5.1
     versionCode: 251
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 46d9f50186388e3a9635bbd649781f2a6818090e
     subdir: app
     sudo:
@@ -130,6 +144,7 @@ Builds:
 
   - versionName: 2.6.0
     versionCode: 260
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 6ec4382c11251728cfc10abbfce1763ba5c6b3fe
     subdir: app
     sudo:
@@ -141,6 +156,7 @@ Builds:
 
   - versionName: 2.6.1
     versionCode: 261
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1ecc8baf62cb170636fcdb65edf0544fb9dc8e65
     subdir: app
     sudo:
@@ -152,6 +168,7 @@ Builds:
 
   - versionName: 2.7.0
     versionCode: 270
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 60ee34a21938b8dbc22b0449b559bfd4913ae46a
     subdir: app
     sudo:
@@ -160,8 +177,9 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/navigation-dynamic-features-fragment/,+2d' build.gradle
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 2.7.0
 CurrentVersionCode: 270
diff --git a/metadata/it.fossoft.timberfoss.yml b/metadata/it.fossoft.timberfoss.yml
index 20d092d9d1..846d35cf9d 100644
--- a/metadata/it.fossoft.timberfoss.yml
+++ b/metadata/it.fossoft.timberfoss.yml
@@ -30,6 +30,7 @@ Repo: https://github.com/fabmazz/Timber
 Builds:
   - versionName: '1.6'
     versionCode: 20
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.6
     subdir: app
     gradle:
@@ -37,12 +38,27 @@ Builds:
 
   - versionName: 1.6.1
     versionCode: 21
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.6.1
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
-CurrentVersion: 1.6.1
-CurrentVersionCode: 21
+  - versionName: '1.8'
+    versionCode: 22
+    disable: https://github.com/fabmazz/Timber/issues/14
+    commit: 4001f15893d86f4bb94d50515e63e86833e8d028
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    prebuild: sed -i -e '/lintOptions {/a abortOnError false' -e '/com.anjlab.android.iab/d'
+        build.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '1.8'
+CurrentVersionCode: 22
diff --git a/metadata/org.addhen.smssync.yml b/metadata/org.addhen.smssync.yml
index e407bc8675..6d0d948d66 100644
--- a/metadata/org.addhen.smssync.yml
+++ b/metadata/org.addhen.smssync.yml
@@ -81,6 +81,7 @@ Builds:
 
   - versionName: 2.7.2
     versionCode: 25
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v2.7.2
     subdir: smssync
     gradle:
@@ -91,43 +92,13 @@ Builds:
 
   - versionName: 2.7.3
     versionCode: 26
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v2.7.3
     subdir: smssync
     gradle:
       - noAnalytics
     prebuild: sed -i -e '/flavorDimensions/i*/' -e '/applicationVariants/i/*' build.gradle
 
-  - versionName: 2.8.0
-    versionCode: 31
-    disable: wip
-    commit: v2.8.0-rc.1
-    subdir: smssync
-    gradle:
-      - noAnalytics
-    srclibs:
-      - CWACMerge@v1.0.1
-      - CWACSacklist@v1.0.1
-    rm:
-      - smssync/libs/*.jar
-    prebuild:
-      - sed -i -e '/flavorDimensions/i*/' -e '/applicationVariants/i/*' -e '/commonsware/d'
-        build.gradle
-      - sed -i -e '/maven {/d' -e '/amazonaws/,+1d' ../build.gradle
-      - cp -fR $$CWACMerge$$/merge/src/com src/main/java/
-      - cp -fR $$CWACSacklist$$/sacklist/src/com src/main/java
-      - sed -i -e '153,163d' build.gradle
-      - sed -i -e '/grgit/d' build.gradle
-
-  - versionName: 2.8.3
-    versionCode: 36
-    disable: incredible gradle mess, no way to build from a clean clone
-    commit: v2.8.3
-    subdir: smssync
-    gradle:
-      - noAnalytics
-    rm:
-      - smssync/libs
-
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: build.gradle|androidVersionCode = (\d+)||v([\d.]+)
diff --git a/metadata/org.emunix.unipatcher.yml b/metadata/org.emunix.unipatcher.yml
index 4cce00ee89..ffc40faee0 100644
--- a/metadata/org.emunix.unipatcher.yml
+++ b/metadata/org.emunix.unipatcher.yml
@@ -90,6 +90,7 @@ Builds:
 
   - versionName: 0.17.1
     versionCode: 170100
+    disable: https://github.com/btimofeev/UniPatcher/issues/66
     commit: v0.17.1
     subdir: app
     gradle:
@@ -102,6 +103,7 @@ Builds:
 
   - versionName: 0.17.2
     versionCode: 170200
+    disable: https://github.com/btimofeev/UniPatcher/issues/66
     commit: v0.17.2
     subdir: app
     gradle:
@@ -112,7 +114,7 @@ Builds:
     preassemble:
       - downloadDependencies
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 0.17.2
 CurrentVersionCode: 170200