diff --git a/metadata/com.dar.nclientv2.yml b/metadata/com.dar.nclientv2.yml
index 6160011c76..81534a4a7a 100644
--- a/metadata/com.dar.nclientv2.yml
+++ b/metadata/com.dar.nclientv2.yml
@@ -211,15 +211,11 @@ Builds:
     gradle:
       - yes
 
-  - versionName: ??-stable-release
-    versionCode: 279
-    commit: 2.7.9
-    subdir: app
-    gradle:
-      - yes
+MaintainerNotes: UpdateCheckMode stays as HTTP as beta version are not reflected in
+    git tags.
 
 AutoUpdateMode: Version +-stable-release %v
-UpdateCheckMode: Tags
-UpdateCheckData: app/build.gradle|versionCode\s+(\d+)|.|versionName\s"([\d.]+)-stable"
-CurrentVersion: ??
-CurrentVersionCode: 279
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/Dar9586/NClientV2/master/app/build.gradle|versionCode\s+(\d+)|.|versionName\s"([\d.]+)-stable"
+CurrentVersion: 2.7.6
+CurrentVersionCode: 276
diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index ebf08e6d55..385c476206 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -474,37 +474,6 @@ Builds:
       - ./link_to_mupdf_1.16.1.sh
     ndk: r21d
 
-  - versionName: 8.3.109-fdroid
-    versionCode: 4030
-    disable: unexpected version name and version code
-    commit: 8.3.109
-    subdir: app/
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ mesa-common-dev libxcursor-dev libxrandr-dev libxinerama-dev
-        libglu1-mesa-dev libxi-dev
-    gradle:
-      - fdroid
-    srclibs:
-      - MuPDF@1.16.1
-    rm:
-      - Builder/libs/
-    prebuild:
-      - sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
-      - sed -i -e '/com.google.gms.google-services/d' -e '/com.google.android.gms/d'
-        -e '/com.cloudrail/d' -e '/include "armeabi-v7a", "arm64-v8a"/d' build.gradle
-      - sed -i -e '/^#!/a\set -e' -e 's|git clone .*|ln -s $$MuPDF$$ mupdf-$VERSION|'
-        -e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
-      - mkdir src/main/jniLibs/
-      - sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
-    scanignore:
-      - Builder/fonts/fonts.zip
-      - app/src/fdroid/assets/fonts.zip
-    build:
-      - pushd ../Builder/
-      - ./link_to_mupdf_1.16.1.sh
-    ndk: r21d
-
 MaintainerNotes: |-
     * Upstream builds separate APKs for each architecture but we build an universal APK.
     * scanner will detect GMS (/com/google/android/gms) in these APKs; those are only stubs here, see https://gitlab.com/fdroid/fdroiddata/-/issues/2272#note_493741256
diff --git a/metadata/com.github.andremiras.etheroll.yml b/metadata/com.github.andremiras.etheroll.yml
index 2171ad47dc..a38c357134 100644
--- a/metadata/com.github.andremiras.etheroll.yml
+++ b/metadata/com.github.andremiras.etheroll.yml
@@ -124,10 +124,11 @@ MaintainerNotes: |-
     Both SDK and NDK path are set to use fdroid ones.
     The auto accept license is disabled since fdroid sdkmanager doesn't support
     the --licenses argument.
+    UpdateCheckMode stays as HTTP as the app has an older tag with a higher version number.
 
-AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v.*$
-UpdateCheckData: src/etherollapp/version.py|__version_code__ = (\d+)|.|__version__
-    = '(\d+\.\d+)'
+AutoUpdateMode: Version v%v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/AndreMiras/EtherollApp/develop/src/etherollapp/version.py|__version_code__
+    = (\d+)|.|__version__ = '(\d+\.\d+)'
 CurrentVersion: '2020.0322'
 CurrentVersionCode: 721202322
diff --git a/metadata/com.github.andremiras.zbarcamdemo.yml b/metadata/com.github.andremiras.zbarcamdemo.yml
index 81282a0c23..b43126fd43 100644
--- a/metadata/com.github.andremiras.zbarcamdemo.yml
+++ b/metadata/com.github.andremiras.zbarcamdemo.yml
@@ -70,10 +70,11 @@ Builds:
 MaintainerNotes: |-
     The auto accept license is disabled since fdroid sdkmanager doesn't support
     the --licenses argument.
+    UpdateCheckMode stays as HTTP as the app has an older tag with a higher version number.
 
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
-UpdateCheckData: src/kivy_garden/zbarcam/version.py|__version_code__ = (\d+)|.|__version__
-    = '(\d+\.\d+)'
-CurrentVersion: '2019.1020'
-CurrentVersionCode: 721202920
+AutoUpdateMode: Version %v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/kivy-garden/zbarcam/develop/src/kivy_garden/zbarcam/version.py|__version_code__
+    = (\d+)|.|__version__ = '(\d+\.\d+)'
+CurrentVersion: '2020.0524'
+CurrentVersionCode: 721202524
diff --git a/metadata/com.leinardi.ubuntucountdownwidget.yml b/metadata/com.leinardi.ubuntucountdownwidget.yml
index 4cce528efe..16201f8df3 100644
--- a/metadata/com.leinardi.ubuntucountdownwidget.yml
+++ b/metadata/com.leinardi.ubuntucountdownwidget.yml
@@ -20,6 +20,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
-UpdateCheckData: version.txt|version:\s.+\+(\d+)|.|version:\s(.+)\+
+UpdateCheckData: version.txt|\+(\d+)|.|(.+)\+
 CurrentVersion: v21.04
 CurrentVersionCode: 259
diff --git a/metadata/com.m3sv.plainupnp.yml b/metadata/com.m3sv.plainupnp.yml
index 06a85350df..3b914d16d4 100644
--- a/metadata/com.m3sv.plainupnp.yml
+++ b/metadata/com.m3sv.plainupnp.yml
@@ -35,9 +35,11 @@ Builds:
     gradle:
       - yes
 
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
+MaintainerNotes: Disable AUM till upstream tags releases https://github.com/m3sv/PlainUPnP/issues/83
+
+AutoUpdateMode: None
+UpdateCheckMode: None
 UpdateCheckData: buildSrc/src/main/kotlin/dependencies.kt|versionCode = (\d+)|.|versionName
     = "([\d\.]+)"
-CurrentVersion: 2.6.2
-CurrentVersionCode: 62
+CurrentVersion: 2.7.0
+CurrentVersionCode: 64
diff --git a/metadata/com.xBrowserSync.android.yml b/metadata/com.xBrowserSync.android.yml
index 7a73d3d483..7f7ac20303 100644
--- a/metadata/com.xBrowserSync.android.yml
+++ b/metadata/com.xBrowserSync.android.yml
@@ -45,6 +45,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
-UpdateCheckData: platform/android/cordova/config.xml|android-versionCode="(\d+)"|.|version="(.*)"
+UpdateCheckData: res/android/config.xml|android-versionCode="(\d+)"|.|version="(.*)"
 CurrentVersion: 1.5.2
 CurrentVersionCode: 15201
diff --git a/metadata/de.bitsharesmunich.smartcoinswallet.yml b/metadata/de.bitsharesmunich.smartcoinswallet.yml
index 4db0c36edf..d5d5198761 100644
--- a/metadata/de.bitsharesmunich.smartcoinswallet.yml
+++ b/metadata/de.bitsharesmunich.smartcoinswallet.yml
@@ -66,14 +66,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.5.14
-    versionCode: 203
-    disable: crashlytics, see https://github.com/kenCode-de/smartcoins-wallet/issues/68
-    commit: v1.5.14
-    subdir: app
-    gradle:
-      - yes
-
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: build.gradle|versionCode (.*)|.|versionName "(.*)"
diff --git a/metadata/de.quaddyservices.dynamicnightlight.yml b/metadata/de.quaddyservices.dynamicnightlight.yml
index 24aa6487d3..91cd302259 100644
--- a/metadata/de.quaddyservices.dynamicnightlight.yml
+++ b/metadata/de.quaddyservices.dynamicnightlight.yml
@@ -65,9 +65,9 @@ Builds:
       - yes
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: HTTP
 VercodeOperation: '%c + 2 '
-UpdateCheckData: app/version.properties|VERSION_CODE=(.*)|app/build.gradle|versionName
+UpdateCheckData: https://raw.githubusercontent.com/quaddy-services/DynamicNightLight/HEAD/app/version.properties|VERSION_CODE=(.*)|https://raw.githubusercontent.com/quaddy-services/DynamicNightLight/master/app/build.gradle|versionName
     "(.*)"
 CurrentVersion: 2.0.
 CurrentVersionCode: 2110
diff --git a/metadata/io.anuke.mindustry.yml b/metadata/io.anuke.mindustry.yml
index 5aa61ab311..0ad2a94af0 100644
--- a/metadata/io.anuke.mindustry.yml
+++ b/metadata/io.anuke.mindustry.yml
@@ -212,7 +212,7 @@ MaintainerNotes: |-
     (https://mindustrygame.github.io/wiki/modding/) 
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
-UpdateCheckData: version_fdroid.txt|versionCode=(.*)|.|versionName=(.*)
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/Anuken/MindustryBuilds/master/version_fdroid.txt|versionCode=(.*)|.|versionName=(.*)
 CurrentVersion: 6-fdroid-125
 CurrentVersionCode: 125
diff --git a/metadata/net.frju.verdure.yml b/metadata/net.frju.verdure.yml
index 689285ebd3..b628d213b0 100644
--- a/metadata/net.frju.verdure.yml
+++ b/metadata/net.frju.verdure.yml
@@ -29,23 +29,6 @@ Builds:
       - git apply ./fdroid.patch
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.4.2
-    versionCode: 30
-    disable: broken checkupdates
-    commit: v1.4.2
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@1.26.0-17.5.pre
-    rm:
-      - ios
-      - .vscode
-      - raw_graphics
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - sed -i 's/.*in_app_review.*//' pubspec.yaml
-      - git apply ./fdroid.patch
-      - $$flutter$$/bin/flutter build apk
-
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
diff --git a/metadata/org.softeg.slartus.forpdaplus.yml b/metadata/org.softeg.slartus.forpdaplus.yml
index a7b2b92570..f86564d3fe 100644
--- a/metadata/org.softeg.slartus.forpdaplus.yml
+++ b/metadata/org.softeg.slartus.forpdaplus.yml
@@ -323,5 +323,5 @@ Builds:
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: updateinfo.json|"versionCode":\s*(\d+)|.|"ver":\s*"([\d.]+)
-CurrentVersion: 3.5.7.6
-CurrentVersionCode: 646
+CurrentVersion: 3.5.8.3
+CurrentVersionCode: 651
diff --git a/metadata/org.transdroid.lite.yml b/metadata/org.transdroid.lite.yml
index ce9dc1cf2e..66000a7a9e 100644
--- a/metadata/org.transdroid.lite.yml
+++ b/metadata/org.transdroid.lite.yml
@@ -152,5 +152,6 @@ Builds:
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 UpdateCheckName: org.transdroid.full
+UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s'([\d.]+)'
 CurrentVersion: 2.5.10
 CurrentVersionCode: 230
diff --git a/metadata/org.wheelmap.android.online.yml b/metadata/org.wheelmap.android.online.yml
index 88d95fe727..755c24c94b 100644
--- a/metadata/org.wheelmap.android.online.yml
+++ b/metadata/org.wheelmap.android.online.yml
@@ -47,6 +47,6 @@ Builds:
       - yes
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: None
 CurrentVersion: 3.0.1
 CurrentVersionCode: 409
diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml
index 37b74a7675..8a8a56a816 100644
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@@ -152,5 +152,6 @@ MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
+UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)"
 CurrentVersion: 1.0.5
 CurrentVersionCode: 149
diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml
index 140c25febe..4801fe001d 100644
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@@ -662,7 +662,8 @@ Builds:
       - sed -i 's:\-Z build-std=core,alloc,std::' $$pEpJNIAdapter$$/android/external/**/Makefile
     ndk: r20b
 
-AutoUpdateMode: None
-UpdateCheckMode: Tags
+AutoUpdateMode: Version
+UpdateCheckMode: Tags ^v[0-9.]*$
+UpdateCheckData: build.gradle|versionCode'\s*:\s*(\d+)|.|versionName'\s*:\s*'([\d.]+)'
 CurrentVersion: 1.1.264
 CurrentVersionCode: 88
diff --git a/metadata/su.xash.husky.yml b/metadata/su.xash.husky.yml
index b996b2cf9b..a34581c5e6 100644
--- a/metadata/su.xash.husky.yml
+++ b/metadata/su.xash.husky.yml
@@ -22,7 +22,9 @@ Builds:
       - huskyBlue
     prebuild: sed -i -e 's/buildnum()/168/g' build.gradle
 
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
+MaintainerNotes: VC is generated on build, no way to check for updates.
+
+AutoUpdateMode: None
+UpdateCheckMode: None
 CurrentVersion: 1.0.1
 CurrentVersionCode: 168
diff --git a/metadata/subreddit.android.appstore.yml b/metadata/subreddit.android.appstore.yml
index 243a3b09e9..ad58dc01a0 100644
--- a/metadata/subreddit.android.appstore.yml
+++ b/metadata/subreddit.android.appstore.yml
@@ -74,6 +74,6 @@ Builds:
 MaintainerNotes: Version and VC are generated on build, no way to check for updates.
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: None
 CurrentVersion: 0.9.2
 CurrentVersionCode: 9200
diff --git a/metadata/tech.ula.yml b/metadata/tech.ula.yml
index ce54e0de1d..f87e645ad9 100644
--- a/metadata/tech.ula.yml
+++ b/metadata/tech.ula.yml
@@ -239,6 +239,6 @@ MaintainerNotes: |-
     App comes with Sentry.io but it is opt-in, so no Tracking AntiFeature needed.
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: None
 CurrentVersion: 2.7.2
 CurrentVersionCode: 2927098
diff --git a/metadata/us.bravender.android.dongsa.yml b/metadata/us.bravender.android.dongsa.yml
index 24ad66949e..1a91cf39ca 100644
--- a/metadata/us.bravender.android.dongsa.yml
+++ b/metadata/us.bravender.android.dongsa.yml
@@ -25,7 +25,7 @@ Builds:
     target: android-8
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: None
 CurrentVersion: '2.2'
 CurrentVersionCode: 8
 
diff --git a/metadata/wb.receiptspro.yml b/metadata/wb.receiptspro.yml
index 816035fae2..8b4b859f4d 100644
--- a/metadata/wb.receiptspro.yml
+++ b/metadata/wb.receiptspro.yml
@@ -192,5 +192,6 @@ Builds:
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags
+UpdateCheckData: app/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)"
 CurrentVersion: 4.9.0.387
 CurrentVersionCode: 387