diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index fdd3ebc4f9..b190c3342d 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3558,9 +3558,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1431'
+    versionCode: 1431
+    commit: '1.1431'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1429'
-CurrentVersionCode: 1429
+CurrentVersion: '1.1431'
+CurrentVersionCode: 1431
diff --git a/metadata/foehnix.widget.yml b/metadata/foehnix.widget.yml
index 1fb8ef7db2..63297bdef1 100644
--- a/metadata/foehnix.widget.yml
+++ b/metadata/foehnix.widget.yml
@@ -63,7 +63,7 @@ Builds:
 
   - versionName: '3.0'
     versionCode: 30
-    commit: '3.0'
+    commit: ae9e6f9e43dadaf9195181d355cebc15bbe17f50
     subdir: app
     gradle:
       - yes
diff --git a/metadata/fr.nocle.passegares.yml b/metadata/fr.nocle.passegares.yml
index 18b2a3ac18..06cfc354ac 100644
--- a/metadata/fr.nocle.passegares.yml
+++ b/metadata/fr.nocle.passegares.yml
@@ -220,6 +220,7 @@ Builds:
 
   - versionName: 1.4.1
     versionCode: 201
+    disable: fails to build
     commit: v1.4.1
     subdir: app
     gradle:
diff --git a/metadata/io.github.muntashirakon.AppManager.yml b/metadata/io.github.muntashirakon.AppManager.yml
index 32dafa7f1f..2dbb98ba8d 100644
--- a/metadata/io.github.muntashirakon.AppManager.yml
+++ b/metadata/io.github.muntashirakon.AppManager.yml
@@ -49,6 +49,7 @@ Builds:
 
   - versionName: 2.5.20
     versionCode: 375
+    disable: fails to build
     commit: v2.5.20
     subdir: app
     submodules: true
diff --git a/metadata/openfoodfacts.github.scrachx.openbeauty.yml b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
index b211e08a61..923ecf64ec 100644
--- a/metadata/openfoodfacts.github.scrachx.openbeauty.yml
+++ b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
@@ -279,6 +279,7 @@ Builds:
 
   - versionName: 3.6.0
     versionCode: 360
+    disable: fails to build
     commit: 3.6.0
     subdir: app
     gradle:
diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml
index bd845ae89b..265dfe6876 100644
--- a/metadata/openfoodfacts.github.scrachx.openfood.yml
+++ b/metadata/openfoodfacts.github.scrachx.openfood.yml
@@ -440,6 +440,7 @@ Builds:
 
   - versionName: 3.6.0
     versionCode: 360
+    disable: fails to build
     commit: 3.6.0
     subdir: app
     gradle:
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 17254906d5..8bb3f3447a 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1395,56 +1395,9 @@ Builds:
       - mv jni/static_library_built/openssl/output/android/ jni/openssl/
     ndk: r15c
 
-  - versionName: 2.4.4
-    versionCode: 1144
-    disable: fails to build
-    commit: 2.4.4
-    subdir: aTalk/
-    gradle:
-      - fdroid
-    srclibs:
-      - fmj@r122
-      - jitsi-zrtp4j@7cbd8101108191089aad871002567c2a0eb2b512
-    rm:
-      - aTalk/lib/src_reference/
-      - aTalk/jni/ffmpeg/android/
-      - aTalk/jni/openssl/android/
-      - aTalk/jni/vpx/android/
-    prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
-    scanignore:
-      - aTalk/build.gradle
-    scandelete:
-      - aTalk/jni/static_library_built/libvpx/sources/*.gz
-      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
-    build:
-      - pushd $$fmj$$
-      - ant
-      - popd
-      - pushd $$jitsi-zrtp4j$$
-      - ant jar
-      - popd
-      - mkdir -p lib/bundles
-      - mv $$fmj$$/build/jars/fmj.jar lib/bundles/fmj-1.0-SNAPSHOT.jar
-      - mv $$jitsi-zrtp4j$$/dist/zrtp4j-light.jar lib/bundles/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
-      - pushd jni/static_library_built/ffmpeg-x264/
-      - ./init_update_libs.sh
-      - ./ffmpeg-atalk_build.sh
-      - popd
-      - mv jni/static_library_built/ffmpeg-x264/android/ jni/ffmpeg/
-      - pushd jni/static_library_built/libvpx/
-      - ./init_libvpx.sh
-      - ./build-libvpx4android.sh
-      - popd
-      - mv jni/static_library_built/libvpx/output/android/ jni/vpx/
-      - pushd jni/static_library_built/openssl/
-      - ./init_libopenssl.sh
-      - ./build-openssl4android.sh
-      - popd
-      - mv jni/static_library_built/openssl/output/android/ jni/openssl/
-    ndk: r15c
-
   - versionName: 2.4.5
     versionCode: 1145
+    disable: fails to build
     commit: 2.4.5
     subdir: aTalk/
     gradle:
diff --git a/metadata/org.encointer.wallet.yml b/metadata/org.encointer.wallet.yml
index d9d794fa29..48db4cc292 100644
--- a/metadata/org.encointer.wallet.yml
+++ b/metadata/org.encointer.wallet.yml
@@ -137,6 +137,7 @@ Builds:
 
   - versionName: 0.9.2
     versionCode: 807
+    disable: fails to build
     commit: v0.9.2
     init:
       - curl -Lo node.tar.xz https://nodejs.org/dist/v12.18.2/node-v12.18.2-linux-x64.tar.xz
diff --git a/metadata/org.openpetfoodfacts.scanner.yml b/metadata/org.openpetfoodfacts.scanner.yml
index 819823ac04..8dde813104 100644
--- a/metadata/org.openpetfoodfacts.scanner.yml
+++ b/metadata/org.openpetfoodfacts.scanner.yml
@@ -226,6 +226,7 @@ Builds:
 
   - versionName: 3.6.0
     versionCode: 360
+    disable: fails to build
     commit: 3.6.0
     subdir: app
     gradle: