diff --git a/metadata/com.simplemobiletools.applauncher.yml b/metadata/com.simplemobiletools.applauncher.yml
index 1c37a4e0f8..cc09b796a4 100644
--- a/metadata/com.simplemobiletools.applauncher.yml
+++ b/metadata/com.simplemobiletools.applauncher.yml
@@ -253,6 +253,7 @@ Builds:
 
   - versionName: 5.6.0
     versionCode: 36
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 1b51198086cfa8f1be617413689ee85310bbd8f8
     subdir: app
     sudo:
@@ -265,6 +266,7 @@ Builds:
 
   - versionName: 5.7.0
     versionCode: 37
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 8a86856d07b67a476f40956f9de20be46eb9c34c
     subdir: app
     sudo:
@@ -277,6 +279,7 @@ Builds:
 
   - versionName: 5.7.1
     versionCode: 38
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5aa2abd0bc350ea2bf722ce484228fe4f454b86e
     subdir: app
     sudo:
@@ -287,18 +290,6 @@ Builds:
       - yes
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
-  - versionName: 5.7.2
-    versionCode: 39
-    commit: 2d4d84160bc20eb5e58bac9c6c2368e854fde67d
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
-
   - versionName: 5.7.3
     versionCode: 40
     commit: d96358117606551d3f61de2a08d52a96f28ebb05
diff --git a/metadata/com.simplemobiletools.calculator.yml b/metadata/com.simplemobiletools.calculator.yml
index 387def741f..0515d1cff3 100644
--- a/metadata/com.simplemobiletools.calculator.yml
+++ b/metadata/com.simplemobiletools.calculator.yml
@@ -227,6 +227,7 @@ Builds:
 
   - versionName: 5.6.0
     versionCode: 41
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: d996d3160c0ea24e5adfa9664b973c10416fed1c
     subdir: app
     sudo:
@@ -239,6 +240,7 @@ Builds:
 
   - versionName: 5.6.1
     versionCode: 42
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 2c04843742a680db542eeaf76dc417ca817ab764
     subdir: app
     sudo:
@@ -251,6 +253,7 @@ Builds:
 
   - versionName: 5.6.2
     versionCode: 43
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 79d869dc98223cdc122250cafcad31280c450e83
     subdir: app
     sudo:
@@ -263,6 +266,7 @@ Builds:
 
   - versionName: 5.6.3
     versionCode: 44
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 69e6971a5ccc72c1faf9ad91cc82df4718fc75a0
     subdir: app
     sudo:
@@ -275,6 +279,7 @@ Builds:
 
   - versionName: 5.7.0
     versionCode: 45
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 3c596bcd7c2685890642d26bba4d4f44cda116b3
     subdir: app
     sudo:
@@ -287,6 +292,7 @@ Builds:
 
   - versionName: 5.7.1
     versionCode: 46
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 82e5b5d215689b5084f6bf959dbe1a3d4dd71b5a
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.calendar.pro.yml b/metadata/com.simplemobiletools.calendar.pro.yml
index b1647a0e23..a7c40c8001 100644
--- a/metadata/com.simplemobiletools.calendar.pro.yml
+++ b/metadata/com.simplemobiletools.calendar.pro.yml
@@ -533,6 +533,7 @@ Builds:
 
   - versionName: 6.15.3
     versionCode: 207
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: f54c498f0a564d70277083330e331494764f64e0
     subdir: app
     sudo:
@@ -545,6 +546,7 @@ Builds:
 
   - versionName: 6.15.4
     versionCode: 208
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 4c5596c8f5ec7545e02cd0f53fc4fb96e49a1123
     subdir: app
     sudo:
@@ -557,6 +559,7 @@ Builds:
 
   - versionName: 6.16.0
     versionCode: 209
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: b53e427909cea517f4aa48d3cebeb438822d76e4
     subdir: app
     sudo:
@@ -569,6 +572,7 @@ Builds:
 
   - versionName: 6.16.1
     versionCode: 210
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 97986e813f216d91143a3d95a7300a43dcbfc61a
     subdir: app
     sudo:
@@ -581,6 +585,7 @@ Builds:
 
   - versionName: 6.16.2
     versionCode: 211
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 3c6e853156f3390223fc481848c52675a7395638
     subdir: app
     sudo:
@@ -593,6 +598,7 @@ Builds:
 
   - versionName: 6.17.0
     versionCode: 212
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 2090d81be2283684c88a9384c7be2466e4e1fd37
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.clock.yml b/metadata/com.simplemobiletools.clock.yml
index 33f0af543d..16b1d9b32d 100644
--- a/metadata/com.simplemobiletools.clock.yml
+++ b/metadata/com.simplemobiletools.clock.yml
@@ -198,6 +198,7 @@ Builds:
 
   - versionName: 5.6.1
     versionCode: 25
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: b47b3854edda89379af3446264fa09edde9ac4f0
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.contacts.pro.yml b/metadata/com.simplemobiletools.contacts.pro.yml
index 283410d111..dac84c334e 100644
--- a/metadata/com.simplemobiletools.contacts.pro.yml
+++ b/metadata/com.simplemobiletools.contacts.pro.yml
@@ -340,6 +340,7 @@ Builds:
 
   - versionName: 6.16.1
     versionCode: 86
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 792584be70d3892f813bb86dfa3fa81c718d908d
     subdir: app
     sudo:
@@ -352,6 +353,7 @@ Builds:
 
   - versionName: 6.16.2
     versionCode: 87
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: b5ded3df1866b7e93782e14f0c8bf9827bf0255d
     subdir: app
     sudo:
@@ -364,6 +366,7 @@ Builds:
 
   - versionName: 6.16.3
     versionCode: 88
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5bad2055cb8eb83a3e32d23e609f6e4d5a7548a1
     subdir: app
     sudo:
@@ -376,6 +379,7 @@ Builds:
 
   - versionName: 6.17.0
     versionCode: 89
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 6a6a8ae8f10b904f76bae9e3c59721de8325d4b4
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.dialer.yml b/metadata/com.simplemobiletools.dialer.yml
index 410cea0b7e..4072436506 100644
--- a/metadata/com.simplemobiletools.dialer.yml
+++ b/metadata/com.simplemobiletools.dialer.yml
@@ -207,6 +207,7 @@ Builds:
 
   - versionName: 5.11.0
     versionCode: 29
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 4ced8478fd741a68695ff2a66415a3bea8daef83
     subdir: app
     sudo:
@@ -219,6 +220,7 @@ Builds:
 
   - versionName: 5.11.1
     versionCode: 30
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 2bd7da29219916195e2345335cda509907d0361e
     subdir: app
     sudo:
@@ -231,6 +233,7 @@ Builds:
 
   - versionName: 5.11.2
     versionCode: 31
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5b694e0e269d52b234a877aca0faffe9c1c3c135
     subdir: app
     sudo:
@@ -243,6 +246,7 @@ Builds:
 
   - versionName: 5.11.3
     versionCode: 32
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: e85dfdc325bdb6747fa6061c798f0f6750d65b86
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.draw.pro.yml b/metadata/com.simplemobiletools.draw.pro.yml
index 92f21077dc..3ca3ab3bab 100644
--- a/metadata/com.simplemobiletools.draw.pro.yml
+++ b/metadata/com.simplemobiletools.draw.pro.yml
@@ -159,6 +159,7 @@ Builds:
 
   - versionName: 6.4.1
     versionCode: 63
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 8851c92222b3b085d0943f3ed975c06d5720dcfc
     subdir: app
     sudo:
@@ -171,6 +172,7 @@ Builds:
 
   - versionName: 6.5.0
     versionCode: 64
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: c63c447f5cbcfc9f65c95bc6ce67bc78e04df456
     subdir: app
     sudo:
@@ -183,6 +185,7 @@ Builds:
 
   - versionName: 6.5.1
     versionCode: 65
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 8cc3004006d06c34e82a8e56a1f6c0f5b533e7bd
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.filemanager.pro.yml b/metadata/com.simplemobiletools.filemanager.pro.yml
index 7bd08be6c1..94dbd1a7b6 100644
--- a/metadata/com.simplemobiletools.filemanager.pro.yml
+++ b/metadata/com.simplemobiletools.filemanager.pro.yml
@@ -381,6 +381,7 @@ Builds:
 
   - versionName: 6.10.1
     versionCode: 110
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: cabcfb8cc9da3bf0a73c6faef4c6ea253654c461
     subdir: app
     sudo:
@@ -394,6 +395,7 @@ Builds:
 
   - versionName: 6.11.0
     versionCode: 111
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: c9adb349aedfc20e1b05b9cb1f875b33f9b4e473
     subdir: app
     sudo:
@@ -407,6 +409,7 @@ Builds:
 
   - versionName: 6.11.1
     versionCode: 112
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: db441e573dbbf2bdf3da99f4f8e14f3b973cb15d
     subdir: app
     sudo:
@@ -420,6 +423,7 @@ Builds:
 
   - versionName: 6.11.2
     versionCode: 113
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 7eb8f3325f92a3121c9d6798e7c3d083cf34c09a
     subdir: app
     sudo:
@@ -433,6 +437,7 @@ Builds:
 
   - versionName: 6.11.3
     versionCode: 114
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 7bf2d6d7a365172519c2781dabaa892c68b49973
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.flashlight.yml b/metadata/com.simplemobiletools.flashlight.yml
index 30eeb79092..4da45d317f 100644
--- a/metadata/com.simplemobiletools.flashlight.yml
+++ b/metadata/com.simplemobiletools.flashlight.yml
@@ -270,6 +270,7 @@ Builds:
 
   - versionName: 5.5.0
     versionCode: 48
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 93d1900d2880b53178158503463bd6be8985b015
     subdir: app
     sudo:
@@ -282,6 +283,7 @@ Builds:
 
   - versionName: 5.5.1
     versionCode: 49
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: ff99c864baf4ea94b9135816ace73d1ef6199f12
     subdir: app
     sudo:
@@ -294,6 +296,7 @@ Builds:
 
   - versionName: 5.5.2
     versionCode: 50
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5483ff3d348d50a3af179fc7ed73b73573d597d1
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.gallery.pro.yml b/metadata/com.simplemobiletools.gallery.pro.yml
index 72aadcb77b..fd50d92ee6 100644
--- a/metadata/com.simplemobiletools.gallery.pro.yml
+++ b/metadata/com.simplemobiletools.gallery.pro.yml
@@ -835,6 +835,7 @@ Builds:
 
   - versionName: 6.21.3
     versionCode: 349
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 651f297307c45999ce2a430620c0e4adac497449
     subdir: app
     sudo:
@@ -849,6 +850,7 @@ Builds:
 
   - versionName: 6.21.4
     versionCode: 350
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 7bce1ce3146e6ed7df5e534099e9cd0dd874bb4f
     subdir: app
     sudo:
@@ -863,6 +865,7 @@ Builds:
 
   - versionName: 6.21.6
     versionCode: 353
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: a87d3281dce235849a399f7efb28d71de39f7782
     subdir: app
     sudo:
@@ -877,6 +880,7 @@ Builds:
 
   - versionName: 6.21.7
     versionCode: 354
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5fe002ab34357bceab81e97b85097c3203fae7c6
     subdir: app
     sudo:
@@ -891,6 +895,7 @@ Builds:
 
   - versionName: 6.22.0
     versionCode: 355
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 0c1e87fd1c9a38bf27ecd83dfc145c7277907e30
     subdir: app
     sudo:
@@ -905,6 +910,7 @@ Builds:
 
   - versionName: 6.22.1
     versionCode: 356
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: ca2d6eba3e533be602b83b9c00451bf75c4f69d4
     subdir: app
     sudo:
@@ -919,6 +925,7 @@ Builds:
 
   - versionName: 6.22.2
     versionCode: 357
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: f88e1848d76f75fac8b9db237db591b8eba17369
     subdir: app
     sudo:
@@ -933,6 +940,7 @@ Builds:
 
   - versionName: 6.22.3
     versionCode: 358
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 656bd66aee73007db751e46941ee353ce5a23243
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.musicplayer.yml b/metadata/com.simplemobiletools.musicplayer.yml
index 34f53c4956..234fbb01da 100644
--- a/metadata/com.simplemobiletools.musicplayer.yml
+++ b/metadata/com.simplemobiletools.musicplayer.yml
@@ -597,6 +597,7 @@ Builds:
 
   - versionName: 5.8.1
     versionCode: 90
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 13507d41050216c379ad45d910faf06315db5990
     subdir: app
     sudo:
@@ -609,6 +610,7 @@ Builds:
 
   - versionName: 5.8.2
     versionCode: 91
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 00f8ae15fc2e9ba06112c4bcdd62859f55e8c93d
     subdir: app
     sudo:
@@ -621,6 +623,7 @@ Builds:
 
   - versionName: 5.9.0
     versionCode: 92
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: fc76e12eaca6bb21af52841022409a194bcaf681
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.notes.pro.yml b/metadata/com.simplemobiletools.notes.pro.yml
index 6c73aebd6d..9433c570ed 100644
--- a/metadata/com.simplemobiletools.notes.pro.yml
+++ b/metadata/com.simplemobiletools.notes.pro.yml
@@ -272,6 +272,7 @@ Builds:
 
   - versionName: 6.9.1
     versionCode: 87
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 57731207eb43a20d026fc999f59b6b13513883ed
     subdir: app
     sudo:
@@ -284,6 +285,7 @@ Builds:
 
   - versionName: 6.10.0
     versionCode: 88
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 1766b73a50285f4d5a0ea4c787617a5b2e5cb24f
     subdir: app
     sudo:
@@ -296,6 +298,7 @@ Builds:
 
   - versionName: 6.10.1
     versionCode: 89
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: c4bdeb9b765d659f799c24c896dd4073ddaa47c6
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.smsmessenger.yml b/metadata/com.simplemobiletools.smsmessenger.yml
index a93fccf746..ecadc47a14 100644
--- a/metadata/com.simplemobiletools.smsmessenger.yml
+++ b/metadata/com.simplemobiletools.smsmessenger.yml
@@ -251,6 +251,7 @@ Builds:
 
   - versionName: 5.10.3
     versionCode: 38
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5366eadcde33ca6adf11677f88fd9234d0398e1f
     subdir: app
     sudo:
@@ -263,6 +264,7 @@ Builds:
 
   - versionName: 5.11.0
     versionCode: 39
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 95fbe59ac8db3ade9579aa8c7e6918bb8ae31108
     subdir: app
     sudo:
@@ -275,6 +277,7 @@ Builds:
 
   - versionName: 5.11.1
     versionCode: 40
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 5863ef292e33272c5b5b8dcd40077c3bff442a58
     subdir: app
     sudo:
@@ -287,6 +290,7 @@ Builds:
 
   - versionName: 5.11.2
     versionCode: 41
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: f2c42cd8261a7e485e18f3ea23de5107e6aafb19
     subdir: app
     sudo:
@@ -299,6 +303,7 @@ Builds:
 
   - versionName: 5.12.0
     versionCode: 42
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 0774e0cb0f03dbb8d4f175ff465d74310a17729e
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.thankyou.yml b/metadata/com.simplemobiletools.thankyou.yml
index a8d2a034f4..79be563c73 100644
--- a/metadata/com.simplemobiletools.thankyou.yml
+++ b/metadata/com.simplemobiletools.thankyou.yml
@@ -142,6 +142,7 @@ Builds:
 
   - versionName: 5.4.0
     versionCode: 21
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: df9517b24188357e4f414d10baa0a37ba3cbeb30
     subdir: app
     sudo:
@@ -154,6 +155,7 @@ Builds:
 
   - versionName: 5.4.1
     versionCode: 22
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: b458e42f1487c511d4f9e3a8a7fe120f707b61ed
     subdir: app
     sudo:
diff --git a/metadata/com.simplemobiletools.voicerecorder.yml b/metadata/com.simplemobiletools.voicerecorder.yml
index cf4e6743da..c62ea9d252 100644
--- a/metadata/com.simplemobiletools.voicerecorder.yml
+++ b/metadata/com.simplemobiletools.voicerecorder.yml
@@ -107,6 +107,7 @@ Builds:
 
   - versionName: 5.6.0
     versionCode: 14
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 6da02d40c188db905c21bbcee2d6e4470382ca4e
     subdir: app
     sudo:
@@ -119,6 +120,7 @@ Builds:
 
   - versionName: 5.6.1
     versionCode: 15
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: 3061ca7b3fa9bececcad6bcc0d6fc76e6a3ca1d2
     subdir: app
     sudo:
@@ -131,6 +133,7 @@ Builds:
 
   - versionName: 5.6.2
     versionCode: 16
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: a328eb1d1899799ee9a3ddd0914021516b5154d6
     subdir: app
     sudo:
@@ -143,6 +146,7 @@ Builds:
 
   - versionName: 5.6.3
     versionCode: 17
+    disable: https://gitlab.com/fdroid/rfp/-/issues/2007
     commit: aead0af63e060e86ec6a63efea7bf5d8aba786da
     subdir: app
     sudo: