diff --git a/metadata/com.github.linwoodcloud.dev_doctor.yml b/metadata/com.github.linwoodcloud.dev_doctor.yml
index 8ebb0a6a82..6927264d8d 100644
--- a/metadata/com.github.linwoodcloud.dev_doctor.yml
+++ b/metadata/com.github.linwoodcloud.dev_doctor.yml
@@ -41,24 +41,9 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: "'1.5.1"
-    versionCode: 13
-    commit: v'1.5.1
-    subdir: app
-    output: build/app/outputs/apk/release/app-release-unsigned.apk
-    srclibs:
-      - flutter@2.0.5
-    rm:
-      - app/ios
-      - app/web
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk
-
-  - versionName: "'1.5.2"
+  - versionName: 1.5.2
     versionCode: 14
-    commit: v'1.5.2
+    commit: v1.5.2
     subdir: app
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -73,6 +58,6 @@ Builds:
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP
-UpdateCheckData: https://raw.githubusercontent.com/LinwoodCloud/dev_doctor/release/app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: "'1.5.2"
+UpdateCheckData: https://raw.githubusercontent.com/LinwoodCloud/dev_doctor/release/app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s'(.+)\+
+CurrentVersion: 1.5.2
 CurrentVersionCode: 14
diff --git a/metadata/com.unicornsonlsd.finamp.yml b/metadata/com.unicornsonlsd.finamp.yml
index a13dde27b8..cf5c187c41 100644
--- a/metadata/com.unicornsonlsd.finamp.yml
+++ b/metadata/com.unicornsonlsd.finamp.yml
@@ -27,7 +27,7 @@ Builds:
 
   - versionName: 0.4.3
     versionCode: 10
-    commit: v0.4.3
+    commit: 0.4.3
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.0.6
@@ -38,7 +38,7 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - $$flutter$$/bin/flutter build apk
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 UpdateCheckData: https://github.com/UnicornsOnLSD/finamp/raw/master/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 0.4.3
diff --git a/metadata/de.kromke.andreas.mediascanner.yml b/metadata/de.kromke.andreas.mediascanner.yml
index 5b71a21c07..72075508b2 100644
--- a/metadata/de.kromke.andreas.mediascanner.yml
+++ b/metadata/de.kromke.andreas.mediascanner.yml
@@ -87,8 +87,8 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle
-    ndk: r21d
+    prebuild: sed -i -e 's/21.0.6113669/21.4.7075529/' build.gradle
+    ndk: r21e
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/de.saschahlusiak.freebloks.yml b/metadata/de.saschahlusiak.freebloks.yml
index c0b157e921..0a6b0c6ffb 100644
--- a/metadata/de.saschahlusiak.freebloks.yml
+++ b/metadata/de.saschahlusiak.freebloks.yml
@@ -118,21 +118,6 @@ Builds:
       - sed -i -e '/google-services/d' build.gradle
     ndk: r21d
 
-  - versionName: 1.3.3
-    versionCode: 113
-    commit: 1.3.3
-    subdir: app
-    submodules: true
-    gradle:
-      - standardFdroid
-    rm:
-      - google-services/
-      - stuff/
-    prebuild:
-      - sed -i -e '/crashlytics/d' build.gradle
-      - sed -i -e '/google-services/d' build.gradle
-    ndk: r21d
-
   - versionName: 1.3.4
     versionCode: 114
     commit: 1.3.4
@@ -146,7 +131,8 @@ Builds:
     prebuild:
       - sed -i -e '/crashlytics/d' build.gradle
       - sed -i -e '/google-services/d' build.gradle
-    ndk: r21d
+      - sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
+    ndk: r21e
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml
index 33ee2ad926..9e1d94255f 100644
--- a/metadata/de.spiritcroc.riotx.yml
+++ b/metadata/de.spiritcroc.riotx.yml
@@ -366,6 +366,7 @@ Builds:
 
   - versionName: 1.1.6.sc31
     versionCode: 40100450
+    disable: https://github.com/SchildiChat/SchildiChat-android/issues/60
     commit: sc_v1.1.6.sc31
     subdir: vector
     gradle:
diff --git a/metadata/org.freenetproject.mobile.yml b/metadata/org.freenetproject.mobile.yml
index 4fda7f29bb..3085600a6a 100644
--- a/metadata/org.freenetproject.mobile.yml
+++ b/metadata/org.freenetproject.mobile.yml
@@ -58,6 +58,7 @@ Builds:
 
   - versionName: 0.3.3-beta
     versionCode: 304
+    disable: https://github.com/freenet-mobile/app/issues/89
     commit: v0.3.3-beta
     subdir: app
     gradle: