diff --git a/metadata/com.mattermost.rnbeta.yml b/metadata/com.mattermost.rnbeta.yml
index a76a01c9db..d5188c5612 100644
--- a/metadata/com.mattermost.rnbeta.yml
+++ b/metadata/com.mattermost.rnbeta.yml
@@ -583,6 +583,7 @@ Builds:
 
   - versionName: 1.32.0
     versionCode: 302
+    disable: fails to build
     commit: v1.32.0
     subdir: android/app/
     sudo:
diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml
index c642369b72..e1f19c4752 100644
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@@ -109,7 +109,7 @@ Builds:
       - make download-sources
       - make install-all
       - popd
-    ndk: r21b
+    ndk: r21d
 
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 71d989f5f4..21bd9f8478 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -1259,7 +1259,7 @@ Builds:
       - make download-sources
       - make install-all
       - popd
-    ndk: r21b
+    ndk: r21d
 
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
diff --git a/metadata/de.geeksfactory.opacclient.yml b/metadata/de.geeksfactory.opacclient.yml
index c803685bd2..4891ffa969 100644
--- a/metadata/de.geeksfactory.opacclient.yml
+++ b/metadata/de.geeksfactory.opacclient.yml
@@ -2624,6 +2624,7 @@ Builds:
 
   - versionName: 6.2.8
     versionCode: 219
+    disable: cwac-adapter no longer available
     commit: 6.2.8
     subdir: opacclient/opacapp
     submodules: true
diff --git a/metadata/design.codeux.authpass.fdroid.yml b/metadata/design.codeux.authpass.fdroid.yml
index 6395b9def8..ad65620dfd 100644
--- a/metadata/design.codeux.authpass.fdroid.yml
+++ b/metadata/design.codeux.authpass.fdroid.yml
@@ -180,7 +180,7 @@ Builds:
       - echo 'systemProp.design.codeux.ndkVersion=21.2.6472646' >> android/gradle.properties
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release
-    ndk: r21c
+    ndk: r21d
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 630bb3e3e0..404c7d3a39 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -2578,46 +2578,6 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21b
 
-  - versionName: '1.1207'
-    versionCode: 1207
-    commit: '1.1207'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21d
-
-  - versionName: '1.1208'
-    versionCode: 1208
-    commit: '1.1208'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21d
-
-  - versionName: '1.1209'
-    versionCode: 1209
-    commit: '1.1209'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21d
-
-  - versionName: '1.1211'
-    versionCode: 1211
-    commit: '1.1211'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21d
-
   - versionName: '1.1213'
     versionCode: 1213
     commit: '1.1213'
diff --git a/metadata/io.lbry.browser.yml b/metadata/io.lbry.browser.yml
index 80b175974c..267e12c7a5 100644
--- a/metadata/io.lbry.browser.yml
+++ b/metadata/io.lbry.browser.yml
@@ -11,19 +11,6 @@ RepoType: git
 Repo: https://github.com/kekkyojin/lbry-android
 
 Builds:
-  - versionName: 0.15.12
-    versionCode: 15121
-    commit: v0.15.12-fdroid
-    subdir: app
-    gradle:
-      - __32bit
-    rm:
-      - .gitsecret/keys/random_seed
-    prebuild:
-      - sed "/lbryio/d" -i ../build.gradle
-      - sed -r "s:29.0.1:29.0.2:" -i build.gradle
-    ndk: r21d
-
   - versionName: 0.15.12
     versionCode: 15122
     commit: v0.15.12-fdroid
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 9e5bec0257..bd81b32661 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1036,6 +1036,10 @@ Builds:
     prebuild: sed -i -e "/clean.dependsOn 'ndkClean'/d" build.gradle
     scanignore:
       - aTalk/build.gradle
+    scandelete:
+      - aTalk/lib/src_reference/*/*.zip
+      - aTalk/third_party/m2/org/igniterealtime/smack/*/*/*.jar
+      - aTalk/jni/static_library_built/libvpx/sources/*.gz
     build:
       - pushd $$fmj$$
       - ant
diff --git a/metadata/org.courville.nova.yml b/metadata/org.courville.nova.yml
index cbe1c55355..552fa59846 100644
--- a/metadata/org.courville.nova.yml
+++ b/metadata/org.courville.nova.yml
@@ -90,7 +90,7 @@ Builds:
       - native/ffmpeg-android-builder/dist-full-*
       - MediaLib/libs/*jar
     prebuild: rm -f FileCoreLibrary/libs/*jar
-    ndk: r21b
+    ndk: r21d
     gradleprops:
       - universal
 
diff --git a/metadata/org.koreader.launcher.yml b/metadata/org.koreader.launcher.yml
index c9c2e89c47..686444b4ec 100644
--- a/metadata/org.koreader.launcher.yml
+++ b/metadata/org.koreader.launcher.yml
@@ -347,6 +347,7 @@ Builds:
     prebuild: sed -i -e 's#./gradlew#gradle#' platform/android/luajit-launcher/Makefile
     scandelete:
       - base/thirdparty/
+      - base/spec/unit/data/
     build:
       - NDK=$$NDK$$
       - SDK=$$SDK$$
diff --git a/metadata/org.mozilla.klar.yml b/metadata/org.mozilla.klar.yml
index 9acccb7729..0ca462f33a 100644
--- a/metadata/org.mozilla.klar.yml
+++ b/metadata/org.mozilla.klar.yml
@@ -734,6 +734,7 @@ Builds:
 
   - versionName: 8.4.0
     versionCode: 242
+    disable: many archives, needs cleanup
     commit: v8.4.0
     timeout: 28800
     subdir: app