diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 0c945aa703..6de7d0e00d 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -406,6 +406,9 @@ Builds:
         -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
diff --git a/metadata/com.ichi2.anki.yml b/metadata/com.ichi2.anki.yml
index 5c3d359989..839d42ce50 100644
--- a/metadata/com.ichi2.anki.yml
+++ b/metadata/com.ichi2.anki.yml
@@ -550,6 +550,7 @@ Builds:
     rm:
       - tools
       - docs
+    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle
     ndk: r21d
 
 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
diff --git a/metadata/com.termux.yml b/metadata/com.termux.yml
index 3e1766642b..2db9730d96 100644
--- a/metadata/com.termux.yml
+++ b/metadata/com.termux.yml
@@ -585,6 +585,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e 's/21.2.6472646/21.3.6528147/' build.gradle
     ndk: r21d
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
index 044be4e49e..9bd67f03f4 100644
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -366,15 +366,6 @@ Builds:
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
 
-  - versionName: 1.0.56
-    versionCode: 10056
-    commit: 1.0.56
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk: r13b
-
   - versionName: 1.0.57
     versionCode: 10057
     commit: 1.0.57
diff --git a/metadata/design.codeux.authpass.fdroid.yml b/metadata/design.codeux.authpass.fdroid.yml
index ad65620dfd..ab1f1cebfe 100644
--- a/metadata/design.codeux.authpass.fdroid.yml
+++ b/metadata/design.codeux.authpass.fdroid.yml
@@ -177,7 +177,7 @@ Builds:
       - authpass/macos
       - deps/kdbx.dart/libargon2*
     build:
-      - echo 'systemProp.design.codeux.ndkVersion=21.2.6472646' >> android/gradle.properties
+      - echo 'systemProp.design.codeux.ndkVersion=21.3.6528147' >> android/gradle.properties
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release
     ndk: r21d
diff --git a/metadata/dev.msfjarvis.aps.yml b/metadata/dev.msfjarvis.aps.yml
index 8300a51968..4ab5a10d16 100644
--- a/metadata/dev.msfjarvis.aps.yml
+++ b/metadata/dev.msfjarvis.aps.yml
@@ -30,6 +30,10 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild:
+      - mkdir -p $HOME/.gradle
+      - echo "org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        -Dfile.encoding=UTF-8" >> $HOME/.gradle/gradle.properties
     scanignore:
       - app/src/main/assets/publicsuffixes
 
diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml
index 665ea4a622..d4efbfc043 100644
--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@@ -365,7 +365,7 @@ Builds:
       - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
       - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
         build.gradle
-      - sed -i -e '/firebaseCrashlytics/,+2d' -e '/^android\.applicationVariants\.all
+      - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all
         {/,/^}$/d' build.gradle
 
 AutoUpdateMode: Version %v
diff --git a/metadata/net.kollnig.missioncontrol.fdroid.yml b/metadata/net.kollnig.missioncontrol.fdroid.yml
index fada139cbb..491729df17 100644
--- a/metadata/net.kollnig.missioncontrol.fdroid.yml
+++ b/metadata/net.kollnig.missioncontrol.fdroid.yml
@@ -52,7 +52,7 @@ Builds:
     subdir: app
     gradle:
       - fdroid
-    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' build.gradle
+    prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle
     ndk: r21d
 
 AutoUpdateMode: Version %c
diff --git a/metadata/org.projectmaxs.main.yml b/metadata/org.projectmaxs.main.yml
index 7b2dd12942..9ba70b22c6 100644
--- a/metadata/org.projectmaxs.main.yml
+++ b/metadata/org.projectmaxs.main.yml
@@ -285,6 +285,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.alarmset.yml b/metadata/org.projectmaxs.module.alarmset.yml
index d369cd4c95..26b0948a34 100644
--- a/metadata/org.projectmaxs.module.alarmset.yml
+++ b/metadata/org.projectmaxs.module.alarmset.yml
@@ -246,19 +246,6 @@ Builds:
       - module-shell/libraryProjects/root-commands/ExampleApp
     prebuild: make prebuild
 
-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-alarmset
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-alarmset/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
   - versionName: 0.5.9
     versionCode: 2000503279
     commit: 0.5.9
@@ -273,6 +260,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.bluetooth.yml b/metadata/org.projectmaxs.module.bluetooth.yml
index 3bd2f954f2..5ad7ed5052 100644
--- a/metadata/org.projectmaxs.module.bluetooth.yml
+++ b/metadata/org.projectmaxs.module.bluetooth.yml
@@ -365,19 +365,6 @@ Builds:
       - module-shell/libraryProjects/root-commands/ExampleApp
     prebuild: make prebuild
 
-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-bluetooth
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-bluetooth/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
   - versionName: 0.5.9
     versionCode: 2000503279
     commit: 0.5.9
@@ -392,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.bluetoothadmin.yml b/metadata/org.projectmaxs.module.bluetoothadmin.yml
index 4ca94b7316..33a00cc506 100644
--- a/metadata/org.projectmaxs.module.bluetoothadmin.yml
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.yml
@@ -365,19 +365,6 @@ Builds:
       - module-shell/libraryProjects/root-commands/ExampleApp
     prebuild: make prebuild
 
-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: module-bluetoothadmin
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    init: make -C .. module-bluetoothadmin/Makefile
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-    prebuild: make prebuild
-
   - versionName: 0.5.9
     versionCode: 2000503279
     commit: 0.5.9
@@ -392,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.clipboard.yml b/metadata/org.projectmaxs.module.clipboard.yml
index 26f10f1618..7587d88a35 100644
--- a/metadata/org.projectmaxs.module.clipboard.yml
+++ b/metadata/org.projectmaxs.module.clipboard.yml
@@ -379,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.contactsread.yml b/metadata/org.projectmaxs.module.contactsread.yml
index e4a22c1616..08c5b2365f 100644
--- a/metadata/org.projectmaxs.module.contactsread.yml
+++ b/metadata/org.projectmaxs.module.contactsread.yml
@@ -389,6 +389,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.fileread.yml b/metadata/org.projectmaxs.module.fileread.yml
index 1e69694183..1f2819a585 100644
--- a/metadata/org.projectmaxs.module.fileread.yml
+++ b/metadata/org.projectmaxs.module.fileread.yml
@@ -379,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.filewrite.yml b/metadata/org.projectmaxs.module.filewrite.yml
index bd513591a4..5d1c5705c3 100644
--- a/metadata/org.projectmaxs.module.filewrite.yml
+++ b/metadata/org.projectmaxs.module.filewrite.yml
@@ -391,6 +391,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.locationfine.yml b/metadata/org.projectmaxs.module.locationfine.yml
index bd94d02550..f605d487d8 100644
--- a/metadata/org.projectmaxs.module.locationfine.yml
+++ b/metadata/org.projectmaxs.module.locationfine.yml
@@ -261,6 +261,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.misc.yml b/metadata/org.projectmaxs.module.misc.yml
index da86ecfe13..cf76cb8f7d 100644
--- a/metadata/org.projectmaxs.module.misc.yml
+++ b/metadata/org.projectmaxs.module.misc.yml
@@ -261,6 +261,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.nfc.yml b/metadata/org.projectmaxs.module.nfc.yml
index 30ca92e85b..4bb6a6304f 100644
--- a/metadata/org.projectmaxs.module.nfc.yml
+++ b/metadata/org.projectmaxs.module.nfc.yml
@@ -215,6 +215,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.notification.yml b/metadata/org.projectmaxs.module.notification.yml
index e46ff70f61..71a8f59615 100644
--- a/metadata/org.projectmaxs.module.notification.yml
+++ b/metadata/org.projectmaxs.module.notification.yml
@@ -250,6 +250,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.phonestateread.yml b/metadata/org.projectmaxs.module.phonestateread.yml
index dadc5a9383..f8ec091778 100644
--- a/metadata/org.projectmaxs.module.phonestateread.yml
+++ b/metadata/org.projectmaxs.module.phonestateread.yml
@@ -378,6 +378,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.ringermode.yml b/metadata/org.projectmaxs.module.ringermode.yml
index 514211e4bc..40f002fe31 100644
--- a/metadata/org.projectmaxs.module.ringermode.yml
+++ b/metadata/org.projectmaxs.module.ringermode.yml
@@ -379,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.shell.yml b/metadata/org.projectmaxs.module.shell.yml
index 2d2c995439..e618fcb344 100644
--- a/metadata/org.projectmaxs.module.shell.yml
+++ b/metadata/org.projectmaxs.module.shell.yml
@@ -278,6 +278,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.smsnotify.yml b/metadata/org.projectmaxs.module.smsnotify.yml
index d2dfb2638a..625ce75bf2 100644
--- a/metadata/org.projectmaxs.module.smsnotify.yml
+++ b/metadata/org.projectmaxs.module.smsnotify.yml
@@ -379,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.smsread.yml b/metadata/org.projectmaxs.module.smsread.yml
index cc754abe16..c18777f81d 100644
--- a/metadata/org.projectmaxs.module.smsread.yml
+++ b/metadata/org.projectmaxs.module.smsread.yml
@@ -379,6 +379,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.smssend.yml b/metadata/org.projectmaxs.module.smssend.yml
index 719c880f4d..8dd38b7a73 100644
--- a/metadata/org.projectmaxs.module.smssend.yml
+++ b/metadata/org.projectmaxs.module.smssend.yml
@@ -391,6 +391,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.smswrite.yml b/metadata/org.projectmaxs.module.smswrite.yml
index e3d31f6e62..0c0b56995d 100644
--- a/metadata/org.projectmaxs.module.smswrite.yml
+++ b/metadata/org.projectmaxs.module.smswrite.yml
@@ -393,6 +393,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.wifiaccess.yml b/metadata/org.projectmaxs.module.wifiaccess.yml
index 04b24ed856..2e19507bc3 100644
--- a/metadata/org.projectmaxs.module.wifiaccess.yml
+++ b/metadata/org.projectmaxs.module.wifiaccess.yml
@@ -273,6 +273,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.module.wifichange.yml b/metadata/org.projectmaxs.module.wifichange.yml
index 7e3586f3c1..01fc2cecd0 100644
--- a/metadata/org.projectmaxs.module.wifichange.yml
+++ b/metadata/org.projectmaxs.module.wifichange.yml
@@ -261,6 +261,6 @@ Builds:
     prebuild: make prebuild
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279
diff --git a/metadata/org.projectmaxs.transport.xmpp.yml b/metadata/org.projectmaxs.transport.xmpp.yml
index 1f60fc3e6c..5efce65a74 100644
--- a/metadata/org.projectmaxs.transport.xmpp.yml
+++ b/metadata/org.projectmaxs.transport.xmpp.yml
@@ -302,17 +302,6 @@ Builds:
     rm:
       - module-shell/libraryProjects/root-commands/ExampleApp
 
-  - versionName: 0.5.9-SNAPSHOT
-    versionCode: 2000502508
-    commit: 0.5.9-SNAPSHOT
-    subdir: transport-xmpp
-    submodules: true
-    sudo: apt-get install -y imagemagick libxml2-utils
-    gradle:
-      - yes
-    rm:
-      - module-shell/libraryProjects/root-commands/ExampleApp
-
   - versionName: 0.5.9
     versionCode: 2000503279
     commit: 0.5.9
@@ -325,6 +314,6 @@ Builds:
       - module-shell/libraryProjects/root-commands/ExampleApp
 
 AutoUpdateMode: Version %v
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.5.9
 CurrentVersionCode: 2000503279