diff --git a/metadata/com.antony.muzei.pixiv.yml b/metadata/com.antony.muzei.pixiv.yml
index 156ad04977..e8cc0d774e 100644
--- a/metadata/com.antony.muzei.pixiv.yml
+++ b/metadata/com.antony.muzei.pixiv.yml
@@ -93,13 +93,6 @@ Builds:
     gradle:
       - prod
 
-  - versionName: 3.3.0
-    versionCode: 296
-    commit: 3.3.0
-    subdir: app
-    gradle:
-      - prod
-
   - versionName: 3.4.1
     versionCode: 298
     commit: 3.4.1
diff --git a/metadata/com.jens.automation2.yml b/metadata/com.jens.automation2.yml
index d38d930010..1d01284865 100644
--- a/metadata/com.jens.automation2.yml
+++ b/metadata/com.jens.automation2.yml
@@ -23,9 +23,9 @@ Builds:
       - sed -i -e '/firebase/d' build.gradle
       - sed -i -e '/play-services-location/d' build.gradle
 
-  - versionName: 1.6.22-apk
+  - versionName: 1.6.22
     versionCode: 98
-    commit: v1.6.22-apk
+    commit: v1.6.23
     subdir: app
     gradle:
       - fdroidFlavor
@@ -35,5 +35,5 @@ Builds:
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
-CurrentVersion: 1.6.22-apk
+CurrentVersion: 1.6.22
 CurrentVersionCode: 98
diff --git a/metadata/com.lucao.limpazap.yml b/metadata/com.lucao.limpazap.yml
index a5d644c231..11f160e6cf 100644
--- a/metadata/com.lucao.limpazap.yml
+++ b/metadata/com.lucao.limpazap.yml
@@ -26,7 +26,7 @@ Builds:
 
   - versionName: 3.0.0
     versionCode: 12
-    commit: v3.0.0
+    commit: '3.0'
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@1.22.5
@@ -36,7 +36,7 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - $$flutter$$/bin/flutter build apk
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 UpdateCheckData: https://raw.githubusercontent.com/lucasew/limpazap//master/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 3.0.0
diff --git a/metadata/com.nextcloud.talk2.yml b/metadata/com.nextcloud.talk2.yml
index c82a2b3c9c..8f48867a05 100644
--- a/metadata/com.nextcloud.talk2.yml
+++ b/metadata/com.nextcloud.talk2.yml
@@ -511,27 +511,6 @@ Builds:
       - app/gplay.gradle
     prebuild: sed -i -e '/work-firebase/d' build.gradle
 
-  - versionName: 12.0.0 Alpha 1
-    versionCode: 120000001
-    disable: pre-release
-    commit: v12.0.0 Alpha 1
-    subdir: app
-    gradle:
-      - generic
-    rm:
-      - app/gplay.gradle
-    prebuild: sed -i -e '/work-firebase/d' build.gradle
-
-  - versionName: 11.1.0
-    versionCode: 120000002
-    commit: v11.1.0
-    subdir: app
-    gradle:
-      - generic
-    rm:
-      - app/gplay.gradle
-    prebuild: sed -i -e '/work-firebase/d' build.gradle
-
   - versionName: 11.1.2
     versionCode: 120000005
     commit: v11.1.2
diff --git a/metadata/de.moooon.acrylicons.yml b/metadata/de.moooon.acrylicons.yml
index 6e022653dc..00e638d19d 100644
--- a/metadata/de.moooon.acrylicons.yml
+++ b/metadata/de.moooon.acrylicons.yml
@@ -57,14 +57,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '7.0'
-    versionCode: 7
-    disable: "'T' is not a valid file-based resource name character"
-    commit: v7.0
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '8.0'
     versionCode: 8
     commit: v8.0
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index faab2f9523..3d57782682 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3758,16 +3758,6 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
-  - versionName: '1.1525'
-    versionCode: 1525
-    commit: '1.1525'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21d
-
   - versionName: '1.1530'
     versionCode: 1530
     commit: '1.1530'
diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml
index ef64b4931f..b287c4baa2 100644
--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@@ -192,6 +192,7 @@ Builds:
 
   - versionName: 5.11.0
     versionCode: 511000000
+    disable: not yet released
     commit: android-v5.11.0
     subdir: android5/app
     gradle:
@@ -220,6 +221,6 @@ Builds:
     ndk: r21e
 
 AutoUpdateMode: Version android-v%v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 5.11.0
 CurrentVersionCode: 511000000
diff --git a/metadata/org.mbach.lemonde.yml b/metadata/org.mbach.lemonde.yml
index 7c8cc73391..06b2c3a3c6 100644
--- a/metadata/org.mbach.lemonde.yml
+++ b/metadata/org.mbach.lemonde.yml
@@ -282,7 +282,7 @@ Builds:
 
   - versionName: 2.1.6
     versionCode: 29
-    commit: v2.1.6
+    commit: 2.1.6
     subdir: android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
@@ -322,7 +322,7 @@ Builds:
       - node_modules/react-native-localize/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 2.1.6
 CurrentVersionCode: 29
diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml
index 0078fbbc14..133426b20a 100644
--- a/metadata/org.xcsoar.yml
+++ b/metadata/org.xcsoar.yml
@@ -286,6 +286,7 @@ Builds:
 
   - versionName: 6.8.18
     versionCode: 120
+    disable: no such tag
     commit: v6.8.18
     submodules: true
     sudo: