diff --git a/metadata/app.pott.kaffeepott.androidclient.yml b/metadata/app.pott.kaffeepott.androidclient.yml
index 9ba879be3e..961362afc4 100644
--- a/metadata/app.pott.kaffeepott.androidclient.yml
+++ b/metadata/app.pott.kaffeepott.androidclient.yml
@@ -14,6 +14,7 @@ Repo: https://git.pott.app/KaffeePott/Android-Client
 Builds:
   - versionName: 1.1.4
     versionCode: 10104
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, don't know why, the website has gone
     commit: 1.1.4
     subdir: app
     gradle:
diff --git a/metadata/be.mygod.vpnhotspot.yml b/metadata/be.mygod.vpnhotspot.yml
index 9f7c2b2eac..71d2f502ba 100644
--- a/metadata/be.mygod.vpnhotspot.yml
+++ b/metadata/be.mygod.vpnhotspot.yml
@@ -233,6 +233,7 @@ Builds:
 
   - versionName: 2.3.0
     versionCode: 119
+    disable: com.android.billingclient
     commit: 2.3.0
     subdir: mobile
     gradle:
@@ -244,6 +245,7 @@ Builds:
 
   - versionName: 2.4.0
     versionCode: 200
+    disable: com.android.billingclient
     commit: v2.4.0
     subdir: mobile
     gradle:
@@ -255,6 +257,7 @@ Builds:
 
   - versionName: 2.4.3
     versionCode: 203
+    disable: com.android.billingclient
     commit: v2.4.3
     subdir: mobile
     gradle:
@@ -266,6 +269,7 @@ Builds:
 
   - versionName: 2.4.4
     versionCode: 204
+    disable: com.android.billingclient
     commit: v2.4.4
     subdir: mobile
     gradle:
@@ -288,6 +292,7 @@ Builds:
 
   - versionName: 2.5.1
     versionCode: 208
+    disable: com.android.billingclient
     commit: v2.5.1
     subdir: mobile
     gradle:
@@ -298,6 +303,7 @@ Builds:
 
   - versionName: 2.5.2
     versionCode: 209
+    disable: com.android.billingclient
     commit: v2.5.2
     subdir: mobile
     gradle:
@@ -308,6 +314,7 @@ Builds:
 
   - versionName: 2.5.3
     versionCode: 210
+    disable: com.android.billingclient
     commit: v2.5.3
     subdir: mobile
     gradle:
@@ -318,6 +325,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 211
+    disable: com.android.billingclient
     commit: v2.5.4
     subdir: mobile
     gradle:
@@ -328,6 +336,7 @@ Builds:
 
   - versionName: 2.5.5
     versionCode: 212
+    disable: com.android.billingclient
     commit: v2.5.5
     subdir: mobile
     gradle:
@@ -338,6 +347,7 @@ Builds:
 
   - versionName: 2.6.2
     versionCode: 215
+    disable: com.android.billingclient
     commit: v2.6.2
     subdir: mobile
     gradle:
@@ -359,6 +369,7 @@ Builds:
 
   - versionName: 2.6.4
     versionCode: 217
+    disable: com.android.billingclient
     commit: v2.6.4
     subdir: mobile
     gradle:
@@ -369,6 +380,7 @@ Builds:
 
   - versionName: 2.6.5
     versionCode: 218
+    disable: com.android.billingclient
     commit: v2.6.5
     subdir: mobile
     gradle:
@@ -379,6 +391,7 @@ Builds:
 
   - versionName: 2.7.1
     versionCode: 220
+    disable: com.android.billingclient
     commit: v2.7.1
     subdir: mobile
     gradle:
diff --git a/metadata/com.app.missednotificationsreminder.yml b/metadata/com.app.missednotificationsreminder.yml
index 2b986d44ef..a2efefd75c 100644
--- a/metadata/com.app.missednotificationsreminder.yml
+++ b/metadata/com.app.missednotificationsreminder.yml
@@ -72,6 +72,7 @@ Builds:
 
   - versionName: 1.1.19
     versionCode: 2010119014
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 1.1.19
     subdir: app
     gradle:
@@ -79,6 +80,7 @@ Builds:
 
   - versionName: 1.1.19
     versionCode: 2010119018
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 1.1.19
     subdir: app
     gradle:
@@ -86,6 +88,7 @@ Builds:
 
   - versionName: 1.3.2.0.10
     versionCode: 2010302010
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 1.3.2
     subdir: app
     gradle:
@@ -94,6 +97,7 @@ Builds:
 
   - versionName: 1.3.2.0.21
     versionCode: 2010302021
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 1.3.2
     subdir: app
     gradle:
diff --git a/metadata/com.beckhamd.nasaimageryfetcher.yml b/metadata/com.beckhamd.nasaimageryfetcher.yml
index c057218cec..24fba3f407 100644
--- a/metadata/com.beckhamd.nasaimageryfetcher.yml
+++ b/metadata/com.beckhamd.nasaimageryfetcher.yml
@@ -14,12 +14,13 @@ Repo: https://github.com/beckhamd/nasa-imagery-fetcher
 Builds:
   - versionName: '1.3'
     versionCode: 7
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v1.3
     subdir: app
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: '1.3'
 CurrentVersionCode: 7
diff --git a/metadata/com.bijoysingh.quicknote.yml b/metadata/com.bijoysingh.quicknote.yml
index 74f772c759..eb355bf384 100644
--- a/metadata/com.bijoysingh.quicknote.yml
+++ b/metadata/com.bijoysingh.quicknote.yml
@@ -124,6 +124,7 @@ Builds:
 
   - versionName: 6.6.3
     versionCode: 111
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 6.6.3
     subdir: app
     gradle:
@@ -133,6 +134,7 @@ Builds:
 
   - versionName: 6.9.5
     versionCode: 123
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v6.9.5
     subdir: app
     gradle:
@@ -142,6 +144,7 @@ Builds:
 
   - versionName: 7.0.15
     versionCode: 145
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 7.0.15
     subdir: app
     gradle:
@@ -149,7 +152,7 @@ Builds:
     rm:
       - scarlet
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 7.0.15
 CurrentVersionCode: 145
diff --git a/metadata/com.blockbasti.justanotherworkouttimer.yml b/metadata/com.blockbasti.justanotherworkouttimer.yml
index e8644685ac..276da5114f 100644
--- a/metadata/com.blockbasti.justanotherworkouttimer.yml
+++ b/metadata/com.blockbasti.justanotherworkouttimer.yml
@@ -15,6 +15,7 @@ Repo: https://github.com/blockbasti/just_another_workout_timer
 Builds:
   - versionName: 1.0.1
     versionCode: 1
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.0.1
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -27,6 +28,7 @@ Builds:
 
   - versionName: 1.1.1
     versionCode: 20210127
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.1.1
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -40,6 +42,7 @@ Builds:
 
   - versionName: 1.2.0
     versionCode: 20210205
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.2.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -53,6 +56,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 20210209
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.3.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -66,6 +70,7 @@ Builds:
 
   - versionName: 1.4.0
     versionCode: 20210221
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.4.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -79,6 +84,7 @@ Builds:
 
   - versionName: 1.4.1
     versionCode: 20210226
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.4.1
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -92,6 +98,7 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 20210227
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.4.2
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -105,6 +112,7 @@ Builds:
 
   - versionName: 1.5.0
     versionCode: 20210307
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.5.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -118,6 +126,7 @@ Builds:
 
   - versionName: 1.6.0
     versionCode: 20210311
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.6.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -131,6 +140,7 @@ Builds:
 
   - versionName: 1.7.0
     versionCode: 20210518
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.7.0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -160,6 +170,7 @@ Builds:
 
   - versionName: 1.9.0
     versionCode: 20210922
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 8c78a425cfb3986f995b9738e7216ce30fb83aa2
     sudo:
       - apt-get update || apt-get update
@@ -178,6 +189,7 @@ Builds:
 
   - versionName: 1.9.1
     versionCode: 20211114
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 2d2bcf4981c0bd9fc522fd9c4610be18bc778d57
     sudo:
       - apt-get update || apt-get update
@@ -196,6 +208,7 @@ Builds:
 
   - versionName: 1.10.0
     versionCode: 20220125
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 3689e18ba431ba683b1f3c02727dec23c2257899
     sudo:
       - apt-get update || apt-get update
@@ -214,6 +227,7 @@ Builds:
 
   - versionName: 1.11.0
     versionCode: 20220207
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: b48f04766615435eb631894a127cd4e659aee2d8
     sudo:
       - apt-get update || apt-get update
@@ -232,6 +246,7 @@ Builds:
 
   - versionName: 1.11.1
     versionCode: 20220218
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: c089fdfcb61734d59f64ea6a61143f3f000fa9e9
     sudo:
       - apt-get update || apt-get update
@@ -250,6 +265,7 @@ Builds:
 
   - versionName: 1.11.2
     versionCode: 20220317
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 65468c6ff176d5cb782644e7c107bdf61bdcf2a2
     sudo:
       - apt-get update || apt-get update
@@ -258,7 +274,9 @@ Builds:
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
       - flutter@2.10.0
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
+    rm:
+      - android/app/proguard-rules.pro
+    prebuild: sed -i -e '/proguardFiles/d' android/app/build.gradle
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
diff --git a/metadata/com.corona_info.yml b/metadata/com.corona_info.yml
index 3c2231ffa3..e276ac9711 100644
--- a/metadata/com.corona_info.yml
+++ b/metadata/com.corona_info.yml
@@ -18,6 +18,7 @@ Repo: https://github.com/devasworski/Corona-Info
 Builds:
   - versionName: v1.2
     versionCode: 12
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, gms
     commit: v1.2
     subdir: Android/app
     gradle:
diff --git a/metadata/com.gitlab.mahc9kez.shadowsocks.foss.yml b/metadata/com.gitlab.mahc9kez.shadowsocks.foss.yml
index b9efac4572..1fe8610cd2 100644
--- a/metadata/com.gitlab.mahc9kez.shadowsocks.foss.yml
+++ b/metadata/com.gitlab.mahc9kez.shadowsocks.foss.yml
@@ -77,6 +77,7 @@ Builds:
 
   - versionName: 5.1.2
     versionCode: 50102000
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, mlkit
     commit: v5.1.2
     subdir: mobile
     submodules: true
@@ -101,6 +102,7 @@ Builds:
 
   - versionName: 5.1.4
     versionCode: 50104000
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, mlkit
     commit: v5.1.4
     subdir: mobile
     submodules: true
diff --git a/metadata/com.google.android.apps.iosched.yml b/metadata/com.google.android.apps.iosched.yml
index 36742417be..698451b787 100644
--- a/metadata/com.google.android.apps.iosched.yml
+++ b/metadata/com.google.android.apps.iosched.yml
@@ -21,6 +21,7 @@ Repo: https://github.com/google/iosched
 Builds:
   - versionName: '0.19'
     versionCode: 19
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: e795b1a40cf4
     subdir: android
     androidupdate:
diff --git a/metadata/com.hanntech.free2pass.yml b/metadata/com.hanntech.free2pass.yml
index cf4825f91d..a55ea9f62d 100644
--- a/metadata/com.hanntech.free2pass.yml
+++ b/metadata/com.hanntech.free2pass.yml
@@ -16,6 +16,7 @@ Repo: https://gitlab.com/hanntech-gmbh/free2pass/free2pass-app.git
 Builds:
   - versionName: 1.4.5
     versionCode: 28
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: Release-1.4.5+28
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
@@ -31,6 +32,7 @@ Builds:
 
   - versionName: 1.4.7
     versionCode: 31
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: Release-1.4.7+31
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
@@ -46,6 +48,7 @@ Builds:
 
   - versionName: 1.4.8
     versionCode: 32
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: Release-1.4.8+32
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
@@ -62,6 +65,7 @@ Builds:
 
   - versionName: 1.4.9
     versionCode: 33
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 700a88bbd41e65af7afb0a5a1ccf7a0f0730dde1
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
@@ -78,6 +82,7 @@ Builds:
 
   - versionName: 1.4.12
     versionCode: 36
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 672df359f27f9a567d6c8052052e59570e91228e
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
@@ -92,6 +97,7 @@ Builds:
 
   - versionName: 1.4.13
     versionCode: 37
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 60d4a41fcda66bdeadd5641bb792020b13b000c0
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
@@ -106,12 +112,19 @@ Builds:
 
   - versionName: 1.5.0
     versionCode: 38
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 41b18cf00a68e127775df60361b577c5a92e4828
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
       - flutter@2.8.1
     rm:
       - ios
+      - linux
+      - macos
+      - web
+      - windows
+      - android/app/proguard-rules.pro
+    prebuild: sed -i -e '/signingConfig /,/proguardFiles/d' android/app/build.gradle
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
diff --git a/metadata/com.meteocool.yml b/metadata/com.meteocool.yml
index 6c85c14c77..5661bcb06e 100644
--- a/metadata/com.meteocool.yml
+++ b/metadata/com.meteocool.yml
@@ -22,6 +22,7 @@ Builds:
 
   - versionName: '2.2'
     versionCode: 35
+    disable: https://github.com/meteocool/android/issues/84
     commit: c5dce46076fd4155936175535eeb55bb9e26ca54
     subdir: app
     sudo:
diff --git a/metadata/com.money.manager.ex.yml b/metadata/com.money.manager.ex.yml
index 50852cbe5e..e02fa1f667 100644
--- a/metadata/com.money.manager.ex.yml
+++ b/metadata/com.money.manager.ex.yml
@@ -30,6 +30,7 @@ Repo: https://github.com/moneymanagerex/android-money-manager-ex
 Builds:
   - versionName: 2019.02.14.2
     versionCode: 994
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2019.02.17.1
     subdir: app/
     gradle:
@@ -37,6 +38,7 @@ Builds:
 
   - versionName: 2019.02.24.1
     versionCode: 996
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2019.02.24.1
     subdir: app/
     gradle:
@@ -44,6 +46,7 @@ Builds:
 
   - versionName: 2019.02.28.997-beta
     versionCode: 997
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2019.02.28.997-beta
     subdir: app/
     gradle:
@@ -51,6 +54,7 @@ Builds:
 
   - versionName: 2019.03.30.998-beta
     versionCode: 998
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2019.03.30.998-beta
     subdir: app/
     gradle:
@@ -58,12 +62,13 @@ Builds:
 
   - versionName: 2019.04.10.1000-beta
     versionCode: 1000
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2019.04.10.1000-beta
     subdir: app/
     gradle:
       - yes
 
-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9.]*$
 CurrentVersion: 2019.02.24.1
 CurrentVersionCode: 996
diff --git a/metadata/com.tunjid.fingergestures.yml b/metadata/com.tunjid.fingergestures.yml
index b5a3af8737..2a43202214 100644
--- a/metadata/com.tunjid.fingergestures.yml
+++ b/metadata/com.tunjid.fingergestures.yml
@@ -73,6 +73,7 @@ Repo: https://github.com/tunjid/digilux-android
 Builds:
   - versionName: 8.0.2
     versionCode: 48
+    disable: billingclient
     commit: v8.0.2
     subdir: app
     gradle:
@@ -81,13 +82,14 @@ Builds:
 
   - versionName: 10.0.2
     versionCode: 55
+    disable: billingclient, https://github.com/tunjid/digilux-android/issues/10
     commit: 1b362c170401dd5323ad5628229c409d0ad5c6a3
     subdir: app
     gradle:
       - yes
     prebuild: sed -i -e '/oss-snapshot-local/d' ../build.gradle
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 10.0.2
 CurrentVersionCode: 55
diff --git a/metadata/com.x1unix.s60icons.yml b/metadata/com.x1unix.s60icons.yml
index 894b11dbea..ce42d153d5 100644
--- a/metadata/com.x1unix.s60icons.yml
+++ b/metadata/com.x1unix.s60icons.yml
@@ -18,6 +18,7 @@ Repo: https://github.com/x1unix/s60-icon-pack
 Builds:
   - versionName: 1.0.0
     versionCode: 100
+    disable: com.onesignal:OneSignal
     commit: v1.0.0
     subdir: app
     gradle:
@@ -26,13 +27,14 @@ Builds:
 
   - versionName: 1.1.0
     versionCode: 110
+    disable: com.onesignal:OneSignal
     commit: v1.1.0
     subdir: app
     gradle:
       - yes
     prebuild: sed -i -e '/drummer-aidan/d' ../build.gradle
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 1.1.0
 CurrentVersionCode: 110
diff --git a/metadata/es.usc.citius.servando.calendula.yml b/metadata/es.usc.citius.servando.calendula.yml
index e5129e85fb..e504052ae2 100644
--- a/metadata/es.usc.citius.servando.calendula.yml
+++ b/metadata/es.usc.citius.servando.calendula.yml
@@ -205,6 +205,7 @@ Builds:
 
   - versionName: 2.5.1
     versionCode: 32
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 20f515b09c437838f506193f3554495aa108dfe1
     subdir: Calendula
     gradle:
@@ -221,6 +222,7 @@ Builds:
 
   - versionName: 2.5.2
     versionCode: 33
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.2
     subdir: Calendula
     gradle:
@@ -237,6 +239,7 @@ Builds:
 
   - versionName: 2.5.3
     versionCode: 34
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.3
     subdir: Calendula
     gradle:
@@ -253,6 +256,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 35
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.4
     subdir: Calendula
     gradle:
@@ -269,6 +273,7 @@ Builds:
 
   - versionName: 2.5.5
     versionCode: 36
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.5
     subdir: Calendula
     gradle:
@@ -285,6 +290,7 @@ Builds:
 
   - versionName: 2.5.6
     versionCode: 37
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.6
     subdir: Calendula
     gradle:
@@ -301,6 +307,7 @@ Builds:
 
   - versionName: 2.5.7
     versionCode: 38
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.7
     subdir: Calendula
     gradle:
@@ -317,6 +324,7 @@ Builds:
 
   - versionName: 2.5.8
     versionCode: 39
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.8
     subdir: Calendula
     gradle:
@@ -333,6 +341,7 @@ Builds:
 
   - versionName: 2.5.9
     versionCode: 40
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.9
     subdir: Calendula
     gradle:
@@ -349,6 +358,7 @@ Builds:
 
   - versionName: 2.5.10
     versionCode: 41
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: v2.5.10
     subdir: Calendula
     gradle:
@@ -365,6 +375,7 @@ Builds:
 
   - versionName: 2.5.11
     versionCode: 42
+    disable: https://github.com/citiususc/calendula/issues/184, com.evernote:android-job
     commit: v2.5.11
     subdir: Calendula
     gradle:
@@ -379,7 +390,7 @@ Builds:
       - popd
       - cp $$google-rfc-2445$$/jars/rfc2445.jar libs/
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 2.5.11
 CurrentVersionCode: 42
diff --git a/metadata/io.github.project_travel_mate.yml b/metadata/io.github.project_travel_mate.yml
index 7d4f100310..7419c5020b 100644
--- a/metadata/io.github.project_travel_mate.yml
+++ b/metadata/io.github.project_travel_mate.yml
@@ -32,6 +32,7 @@ Repo: https://github.com/project-travel-mate/Travel-Mate
 Builds:
   - versionName: 5.5.0
     versionCode: 44
+    disable: cloudinary-android
     commit: 5.5.0
     subdir: Android/app/
     gradle:
@@ -40,13 +41,14 @@ Builds:
 
   - versionName: 5.6.2
     versionCode: 49
+    disable: cloudinary-android, https://github.com/project-travel-mate/Travel-Mate/issues/836
     commit: 5.6.2
     subdir: Android/app/
     gradle:
       - yes
     prebuild: sed -i -e '/repo.commonsware.com.s3.amazonaws.com/d' build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 5.6.2
 CurrentVersionCode: 49
diff --git a/metadata/io.homeassistant.companion.android.minimal.yml b/metadata/io.homeassistant.companion.android.minimal.yml
index be2692690f..c918862325 100644
--- a/metadata/io.homeassistant.companion.android.minimal.yml
+++ b/metadata/io.homeassistant.companion.android.minimal.yml
@@ -145,6 +145,7 @@ Builds:
 
   - versionName: 2021.9.0-minimal
     versionCode: 723
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 2021.9.0
     subdir: app
     sudo:
@@ -162,6 +163,7 @@ Builds:
 
   - versionName: 2021.10.0-minimal
     versionCode: 761
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 2021.10.0
     subdir: app
     sudo:
@@ -179,6 +181,7 @@ Builds:
 
   - versionName: 2021.12.1-minimal
     versionCode: 1818
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 2021.12.1
     subdir: app
     sudo:
diff --git a/metadata/net.frju.verdure.yml b/metadata/net.frju.verdure.yml
index 05eed609e8..acef3e2e25 100644
--- a/metadata/net.frju.verdure.yml
+++ b/metadata/net.frju.verdure.yml
@@ -15,6 +15,7 @@ Repo: https://github.com/FredJul/Warmd
 Builds:
   - versionName: 1.4.1
     versionCode: 29
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: v1.4.1
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
@@ -31,6 +32,7 @@ Builds:
 
   - versionName: 1.4.3
     versionCode: 31
+    disable: https://github.com/FredJul/Warmd/issues/52
     commit: v1.4.3b
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
@@ -44,8 +46,10 @@ Builds:
       - sed -i 's/.*in_app_review.*//' pubspec.yaml
       - git apply ./fdroid.patch
       - $$flutter$$/bin/flutter build apk --no-sound-null-safety
+      - sed -i -e '/io.flutter/d' android/app/proguard-rules.pro
+      - sed -i -e '/shrinkResources/d' android/app/build.gradle
 
-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 1.4.3
diff --git a/metadata/org.gittner.osmbugs.yml b/metadata/org.gittner.osmbugs.yml
index d86bf464c0..d5df5ce13e 100644
--- a/metadata/org.gittner.osmbugs.yml
+++ b/metadata/org.gittner.osmbugs.yml
@@ -161,6 +161,7 @@ Builds:
 
   - versionName: 1-3-1
     versionCode: 41
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-1
     subdir: app
     gradle:
@@ -168,6 +169,7 @@ Builds:
 
   - versionName: 1-3-2
     versionCode: 42
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-2
     subdir: app
     gradle:
@@ -175,6 +177,7 @@ Builds:
 
   - versionName: 1-3-3
     versionCode: 43
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-3
     subdir: app
     gradle:
@@ -182,6 +185,7 @@ Builds:
 
   - versionName: 1-3-4
     versionCode: 44
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-4
     subdir: app
     gradle:
@@ -189,6 +193,7 @@ Builds:
 
   - versionName: 1-3-5
     versionCode: 45
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-5
     subdir: app
     gradle:
@@ -196,10 +201,12 @@ Builds:
 
   - versionName: 1-3-6
     versionCode: 46
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 1-3-6
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e '/navigation-dynamic-features-fragment/d' build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.moire.ultrasonic.yml b/metadata/org.moire.ultrasonic.yml
index d65d3e22fe..b4d0e0c12e 100644
--- a/metadata/org.moire.ultrasonic.yml
+++ b/metadata/org.moire.ultrasonic.yml
@@ -200,6 +200,7 @@ Builds:
 
   - versionName: 2.19.1
     versionCode: 90
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 2.19.1
     subdir: ultrasonic
     gradle:
@@ -207,6 +208,7 @@ Builds:
 
   - versionName: 2.19.2
     versionCode: 91
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 2.19.2
     subdir: ultrasonic
     gradle:
@@ -214,6 +216,7 @@ Builds:
 
   - versionName: 2.20.0
     versionCode: 92
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 2.20.0
     subdir: ultrasonic
     gradle:
@@ -221,6 +224,7 @@ Builds:
 
   - versionName: 2.21.0
     versionCode: 93
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 2.21.0
     subdir: ultrasonic
     gradle:
@@ -228,6 +232,7 @@ Builds:
 
   - versionName: 2.22.0
     versionCode: 94
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: bc8a78e772d7e54df630eec27554fa3458ab330b
     subdir: ultrasonic
     gradle:
@@ -235,6 +240,7 @@ Builds:
 
   - versionName: 2.23.0
     versionCode: 95
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 0a39891b93dd0fe20292cd37221d9c86f06016ad
     subdir: ultrasonic
     gradle:
@@ -242,6 +248,7 @@ Builds:
 
   - versionName: 2.23.1
     versionCode: 97
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: a64fe4735340d1f5468f294e2c356e1fb89296d8
     subdir: ultrasonic
     gradle:
@@ -249,6 +256,7 @@ Builds:
 
   - versionName: 2.24.0
     versionCode: 98
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 62986ca79ddbd9a481ab7d9c18127ccd417f82e0
     subdir: ultrasonic
     gradle:
@@ -256,6 +264,7 @@ Builds:
 
   - versionName: 3.0.0
     versionCode: 99
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: 23d07831648e8e3432682ea1935b2ebe892ed6b0
     subdir: ultrasonic
     gradle:
@@ -263,6 +272,7 @@ Builds:
 
   - versionName: 3.0.1
     versionCode: 100
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: a53d5378bfa2ae346960d8486dbc1d946ce34a4b
     subdir: ultrasonic
     gradle:
@@ -270,6 +280,7 @@ Builds:
 
   - versionName: 3.1.1
     versionCode: 102
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: baa0c92c7afb9341fccb00eecd5aa9fbda43fab6
     subdir: ultrasonic
     sudo:
@@ -281,6 +292,7 @@ Builds:
 
   - versionName: 3.2.0
     versionCode: 103
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, navigation-dynamic-features-fragment
     commit: f121e297df2968d1cc8818547186fcbcf129c2a8
     subdir: ultrasonic
     sudo:
@@ -289,6 +301,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/navigationFeature/d' build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.transdroid.full.yml b/metadata/org.transdroid.full.yml
index fa9ee6c399..19344405de 100644
--- a/metadata/org.transdroid.full.yml
+++ b/metadata/org.transdroid.full.yml
@@ -241,6 +241,7 @@ Builds:
 
   - versionName: 2.5.20
     versionCode: 240
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 29c3b3b0dc71f568e1b17f1d953f4d452736bece
     subdir: app
     gradle:
@@ -253,6 +254,7 @@ Builds:
 
   - versionName: 2.5.21
     versionCode: 241
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 3869be4befef39ffc75965386e256c6873f3f67e
     subdir: app
     sudo:
@@ -269,6 +271,7 @@ Builds:
 
   - versionName: 2.5.22
     versionCode: 242
+    disable: https://github.com/erickok/transdroid/issues/616, com.evernote:android-job
     commit: 98906e8e2467ed5e065f2a7c22610ae2b1fa9caf
     subdir: app
     sudo:
@@ -283,7 +286,7 @@ Builds:
       - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
         src/main/res/values/bools.xml
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags v[\d.]+$
 CurrentVersion: 2.5.22
 CurrentVersionCode: 242
diff --git a/metadata/org.transdroid.lite.yml b/metadata/org.transdroid.lite.yml
index 2e9ceb6dd2..a6664d4194 100644
--- a/metadata/org.transdroid.lite.yml
+++ b/metadata/org.transdroid.lite.yml
@@ -163,6 +163,7 @@ Builds:
 
   - versionName: 2.5.20
     versionCode: 240
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 29c3b3b0dc71f568e1b17f1d953f4d452736bece
     subdir: app
     gradle:
@@ -175,6 +176,7 @@ Builds:
 
   - versionName: 2.5.21
     versionCode: 241
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 3869be4befef39ffc75965386e256c6873f3f67e
     subdir: app
     sudo:
@@ -191,6 +193,7 @@ Builds:
 
   - versionName: 2.5.22
     versionCode: 242
+    disable: https://github.com/erickok/transdroid/issues/616, com.evernote:android-job
     commit: 98906e8e2467ed5e065f2a7c22610ae2b1fa9caf
     subdir: app
     sudo:
@@ -205,7 +208,7 @@ Builds:
       - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
         src/main/res/values/bools.xml
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags v[\d.]+$
 CurrentVersion: 2.5.22
 CurrentVersionCode: 242
diff --git a/metadata/se.oandell.riksdagen.yml b/metadata/se.oandell.riksdagen.yml
index 54b2aa49b2..4109c5bf03 100644
--- a/metadata/se.oandell.riksdagen.yml
+++ b/metadata/se.oandell.riksdagen.yml
@@ -44,6 +44,7 @@ Builds:
 
   - versionName: 2.10.0
     versionCode: 21
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.10.0
     subdir: app
     gradle:
@@ -56,6 +57,7 @@ Builds:
 
   - versionName: 2.10.1
     versionCode: 22
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.10.1
     subdir: app
     gradle:
@@ -68,6 +70,7 @@ Builds:
 
   - versionName: 2.11.0
     versionCode: 23
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: '2.11'
     subdir: app
     gradle:
@@ -80,6 +83,7 @@ Builds:
 
   - versionName: 2.11.1
     versionCode: 24
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.11.1
     subdir: app
     gradle:
@@ -92,6 +96,7 @@ Builds:
 
   - versionName: 2.11.3
     versionCode: 26
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.11.3
     subdir: app
     gradle:
@@ -104,6 +109,7 @@ Builds:
 
   - versionName: 2.13.0
     versionCode: 29
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.13.0-fdroid
     subdir: app
     gradle:
@@ -116,6 +122,7 @@ Builds:
 
   - versionName: 2.13.1
     versionCode: 30
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.13.1
     subdir: app
     gradle:
@@ -128,6 +135,7 @@ Builds:
 
   - versionName: 2.14.1
     versionCode: 32
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.14.1-fdroid
     subdir: app
     gradle:
@@ -140,6 +148,7 @@ Builds:
 
   - versionName: 2.14.7
     versionCode: 39
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004, com.evernote:android-job
     commit: 2.14.7
     subdir: app
     gradle:
@@ -150,7 +159,7 @@ Builds:
       - sed -i -e '/io.fabric/d; /com.google.gms/d; /SafetyApiKey/d' build.gradle
       - sed -i -e '/playImplementation(.*) {/,/}/d; /playImplementation/d' build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9.]+-fdroid$
 CurrentVersion: 2.14.7
 CurrentVersionCode: 39