diff --git a/metadata/com.jens.automation2.yml b/metadata/com.jens.automation2.yml
index 8a32733e5b..3318fd9f9c 100644
--- a/metadata/com.jens.automation2.yml
+++ b/metadata/com.jens.automation2.yml
@@ -65,6 +65,5 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
-UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)"
 CurrentVersion: 1.6.34
 CurrentVersionCode: 105
diff --git a/metadata/com.m3sv.plainupnp.yml b/metadata/com.m3sv.plainupnp.yml
index 3b914d16d4..ecb1a3297a 100644
--- a/metadata/com.m3sv.plainupnp.yml
+++ b/metadata/com.m3sv.plainupnp.yml
@@ -35,10 +35,8 @@ Builds:
     gradle:
       - yes
 
-MaintainerNotes: Disable AUM till upstream tags releases https://github.com/m3sv/PlainUPnP/issues/83
-
-AutoUpdateMode: None
-UpdateCheckMode: None
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
 UpdateCheckData: buildSrc/src/main/kotlin/dependencies.kt|versionCode = (\d+)|.|versionName
     = "([\d\.]+)"
 CurrentVersion: 2.7.0
diff --git a/metadata/de.metager.metagerapp.fdroid.yml b/metadata/de.metager.metagerapp.fdroid.yml
index 0ddddb91a2..4b4369e868 100644
--- a/metadata/de.metager.metagerapp.fdroid.yml
+++ b/metadata/de.metager.metagerapp.fdroid.yml
@@ -24,6 +24,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-UpdateCheckData: app/build.gradle|versionCode (\d+)|.|versionName '([\d.]+)'
+UpdateCheckName: de.metager.metagerapp
 CurrentVersion: 4.2.2
 CurrentVersionCode: 40202
diff --git a/metadata/net.opendasharchive.openarchive.release.yml b/metadata/net.opendasharchive.openarchive.release.yml
index 5f1094324f..a055ca009a 100644
--- a/metadata/net.opendasharchive.openarchive.release.yml
+++ b/metadata/net.opendasharchive.openarchive.release.yml
@@ -43,6 +43,6 @@ MaintainerNotes: |
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-UpdateCheckData: app/build.gradle|versionCode\s*(\d+)|.|versionName\s*"([\d.]+)"
+UpdateCheckName: net.opendasharchive.openarchive
 CurrentVersion: 0.2.3-RC-1
 CurrentVersionCode: 20321
diff --git a/metadata/org.blokada.alarm.yml b/metadata/org.blokada.alarm.yml
index ff83a2c222..236afc51f3 100644
--- a/metadata/org.blokada.alarm.yml
+++ b/metadata/org.blokada.alarm.yml
@@ -620,6 +620,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^4[\d.]+$
-UpdateCheckData: android4/app/build.gradle|versionCode\s*(\d+)|.|versionName\s*"([\d.]+)"
+UpdateCheckName: org.blokada
 CurrentVersion: 4.11.1
 CurrentVersionCode: 411000001
diff --git a/metadata/org.fdroid.fdroid.privileged.ota.yml b/metadata/org.fdroid.fdroid.privileged.ota.yml
index d94385dfbf..2c3821fa88 100644
--- a/metadata/org.fdroid.fdroid.privileged.ota.yml
+++ b/metadata/org.fdroid.fdroid.privileged.ota.yml
@@ -89,6 +89,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-UpdateCheckData: app/src/main/AndroidManifest.xml|android:versionCode="(\d+)"|.|android:versionName="([\d.]+)"
+UpdateCheckName: org.fdroid.fdroid.privileged
 CurrentVersion: 0.2.12
 CurrentVersionCode: 2120
diff --git a/metadata/org.transdroid.lite.yml b/metadata/org.transdroid.lite.yml
index ceb25b1bb4..0840c05a64 100644
--- a/metadata/org.transdroid.lite.yml
+++ b/metadata/org.transdroid.lite.yml
@@ -161,9 +161,8 @@ Builds:
       - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
         src/main/res/values/bools.xml
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
-UpdateCheckName: org.transdroid.full
 UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s'([\d.]+)'
 CurrentVersion: 2.5.19
 CurrentVersionCode: 239
diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml
index f94486404a..ad3f838f97 100644
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@@ -187,8 +187,8 @@ Builds:
 
 MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+$
-UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)"
+UpdateCheckName: se.leap.bitmaskclient
 CurrentVersion: 1.0.9
 CurrentVersionCode: 155