diff --git a/metadata/app.zeusln.zeus.yml b/metadata/app.zeusln.zeus.yml
index a9810e9c89..ea10d4b6dc 100644
--- a/metadata/app.zeusln.zeus.yml
+++ b/metadata/app.zeusln.zeus.yml
@@ -237,6 +237,73 @@ Builds:
       - rm -rf sifir-rs-sdk
     ndk: r21e
 
+  - versionName: 0.6.0-beta1
+    versionCode: 30
+    commit: v0.6.0-beta1
+    subdir: android/app
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288
+      - apt-get update || apt-get update
+      - apt-get install -y g++
+      - apt-get install -y -t stretch-backports npm
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-universal-release-unsigned.apk
+    srclibs:
+      - rustup@1.24.3
+      - sifir-rs-sdk@ef6de5f0d37528ce74addbd3dc2178998d7dec00
+    prebuild:
+      - sed -i -e "/swiperefreshlayout/a implementation(project(':react-native-camera'))
+        { exclude group\x3a 'com.google.firebase'\\ exclude group\x3a 'com.google.android.gms'\\
+        }" build.gradle
+      - echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        -Dfile.encoding=UTF-8' >> ../gradle.properties
+      - cd ../..
+      - npm install
+      - npm run postinstall
+      - cp -r $$sifir-rs-sdk$$ .
+    scanignore:
+      - android/build.gradle
+      - android/app/build.gradle
+      - node_modules/jsc-android
+      - node_modules/v8-android
+      - node_modules/react-native/android
+      - node_modules/react-native-v8/dist/com/facebook/react/react-native
+      - node_modules/react-native/template/android/build.gradle
+      - node_modules/react-native-camera/android/build.gradle
+      - node_modules/react-native-hce/android/build.gradle
+      - node_modules/react-native-gesture-handler/android/lib/build.gradle
+      - node_modules/react-native-nfc-manager/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-secure-key-store/example/android/build.gradle
+      - node_modules/react-native-svg/android/build.gradle
+      - node_modules/react-native-tor/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+      - node_modules/@react-native-community/async-storage/android/build.gradle
+      - node_modules/@react-native-community/masked-view/android/build.gradle
+    scandelete:
+      - node_modules
+      - sifir-rs-sdk
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - rustup default stable
+      - rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
+        i686-linux-android
+      - cargo install cargo-ndk
+      - export ANDROID_NDK=$$NDK$$
+      - cd ../../sifir-rs-sdk/sifir-android
+      - cargo ndk --platform 30 -t arm64-v8a -t armeabi-v7a -t x86 -t x86_64 -o app/tor/src/main/jniLibs
+        build -p sifir-android --release
+      - cd app
+      - gradle assembleRelease
+      - cd ../../..
+      - mv sifir-rs-sdk/sifir-android/app/tor/build/outputs/aar/tor-release.aar node_modules/react-native-tor/android/libs/sifir_android.aar
+      - rm -rf sifir-rs-sdk
+    ndk: r21e
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.6.0-beta1
diff --git a/metadata/ch.famoser.mensa.yml b/metadata/ch.famoser.mensa.yml
index 2e0ed060e8..cf3a845ae1 100644
--- a/metadata/ch.famoser.mensa.yml
+++ b/metadata/ch.famoser.mensa.yml
@@ -22,7 +22,18 @@ Builds:
     gradle:
       - yes
 
-AutoUpdateMode: None
+  - versionName: 1.5.6
+    versionCode: 16
+    commit: c6335c75bd5252df353aee6341bec115b508101b
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 1.5.6
 CurrentVersionCode: 16
diff --git a/metadata/com.darshancomputing.BatteryIndicator.yml b/metadata/com.darshancomputing.BatteryIndicator.yml
index 680738db98..e50cf102ec 100644
--- a/metadata/com.darshancomputing.BatteryIndicator.yml
+++ b/metadata/com.darshancomputing.BatteryIndicator.yml
@@ -60,6 +60,19 @@ Builds:
       - sed -i -e '/secureProperties/d' build.gradle
       - echo -e "android.useAndroidX=true\nandroid.enableJetifier=true" > gradle.properties
 
+  - versionName: 12.0.0
+    versionCode: 26016
+    commit: aa9de3206311346577d3e076dd73c9605b4ead29
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/secureProperties/d' build.gradle
+      - echo -e "android.useAndroidX=true\nandroid.enableJetifier=true" > gradle.properties
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 12.0.0
diff --git a/metadata/com.ghostsq.commander.yml b/metadata/com.ghostsq.commander.yml
index 7cd396c657..5f88e20f4c 100644
--- a/metadata/com.ghostsq.commander.yml
+++ b/metadata/com.ghostsq.commander.yml
@@ -581,6 +581,19 @@ Builds:
     scanignore:
       - src/main/java/com/ghostsq/commander/adapters/CA.java
 
+  - versionName: 1.60.7b1
+    versionCode: 428
+    disable: Could not find method checkReleaseBuilds() for arguments [false] on task ':lint'
+    commit: '79'
+    gradle:
+      - free
+    prebuild:
+      - sed -i -e '/task clean/,/^}/d' build.gradle.root
+      - cat build.gradle >> build.gradle.root
+      - mv build.gradle.root build.gradle
+    scanignore:
+      - src/main/java/com/ghostsq/commander/adapters/CA.java
+
 MaintainerNotes: |-
     No commit messages in source repo! No tags. Apks on website can be used to
     confirm a release is real. Commit where AndroidManifest is changed usually
diff --git a/metadata/com.klee.volumelockr.yml b/metadata/com.klee.volumelockr.yml
index e40efe9d06..d29a318049 100644
--- a/metadata/com.klee.volumelockr.yml
+++ b/metadata/com.klee.volumelockr.yml
@@ -54,6 +54,7 @@ Builds:
 
   - versionName: '1.4'
     versionCode: 6
+    disable: https://github.com/jonathanklee/VolumeLockr/issues/2
     commit: 4d06ace91cffda8f5637a41033f687b14ae72158
     subdir: app
     sudo:
diff --git a/metadata/com.maltaisn.notes.sync.yml b/metadata/com.maltaisn.notes.sync.yml
index 94e0cc16f1..cb85471fe5 100644
--- a/metadata/com.maltaisn.notes.sync.yml
+++ b/metadata/com.maltaisn.notes.sync.yml
@@ -45,15 +45,14 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 10402
-    disable: https://github.com/maltaisn/another-notes-app/issues/58
     commit: 1a343ef826d212de2d29bd52fe33f6007cb55360
     subdir: app
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
-    gradle:
-      - yes
+    output: build/outputs/apk/release/app-release-unsigned.apk
+    build: gradle assembleRelease -x lintVitalAnalyzeRelease
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags v.*[0-9]$
diff --git a/metadata/com.movim.movim.yml b/metadata/com.movim.movim.yml
index 990e40ab36..7e8e36f5c5 100644
--- a/metadata/com.movim.movim.yml
+++ b/metadata/com.movim.movim.yml
@@ -94,15 +94,8 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '0.19'
-    versionCode: 15
-    disable: https://github.com/movim/movim_android/issues/35
-    commit: v0.19.0.0
-    subdir: Movim
-    gradle:
-      - yes
-
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags
-CurrentVersion: '0.19'
-CurrentVersionCode: 15
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 0.18.0.0
+CurrentVersionCode: 13
diff --git a/metadata/com.newsblur.yml b/metadata/com.newsblur.yml
index e2d364e829..9594a63ada 100644
--- a/metadata/com.newsblur.yml
+++ b/metadata/com.newsblur.yml
@@ -1538,6 +1538,34 @@ Builds:
         -e '/Review/d' src/com/newsblur/activity/FeedItemsList.java
       - echo 'package com.newsblur.activity;class Premium:NbActivity() {}' > src/com/newsblur/activity/Premium.kt
 
+  - versionName: '11.2'
+    versionCode: 199
+    commit: 77ad32dfcb1be7d604a91dce34ccb3d9300bdb3e
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    rm:
+      - clients/android/NewsBlur/libs/*.jar
+      - clients/android/NewsBlur/buildtools/*.jar
+      - clients/android/NewsBlur/src/com/newsblur/service/SubscriptionSyncService.kt
+      - clients/android/NewsBlur/src/com/newsblur/subscription
+    prebuild:
+      - mv clients/android/NewsBlur ..
+      - rm -r ./*
+      - mv ../NewsBlur/* .
+      - rm -r ../NewsBlur
+      - sed -i -e '/com.google.android.play/d' -e '/billingclient/d' build.gradle
+      - cd src/com/newsblur
+      - sed -i -e '/play.core/d' -e '/void checkInAppReview/,/^    }/d' -e '/checkInAppReview/d'
+        -e '/void onBackPressed/a super.onBackPressed();}' -e '/reviewInfo != null/,/^    }/d'
+        -e '/Review/d' activity/FeedItemsList.java
+      - sed -i -e '/SubscriptionSyncService/d' activity/InitActivity.kt activity/LoginProgress.kt
+        util/PrefsUtils.java
+      - echo 'package com.newsblur.activity;class Premium:NbActivity() {}' > activity/Premium.kt
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: '11.2'
diff --git a/metadata/com.orgzly.yml b/metadata/com.orgzly.yml
index e7506bf957..6bb0c53372 100644
--- a/metadata/com.orgzly.yml
+++ b/metadata/com.orgzly.yml
@@ -285,6 +285,10 @@ Builds:
     versionCode: 161
     commit: 1b7e0572133790676e13089033bf4dd7d3e700d2
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/com.podverse.fdroid.yml b/metadata/com.podverse.fdroid.yml
index a9c23051f9..e5157e9dd1 100644
--- a/metadata/com.podverse.fdroid.yml
+++ b/metadata/com.podverse.fdroid.yml
@@ -667,6 +667,7 @@ Builds:
 
   - versionName: 4.2.1
     versionCode: 21
+    disable: build failed
     commit: bb75adfd1b4f78e74c43322b1bfce15b144db58f
     subdir: android/app
     sudo:
diff --git a/metadata/com.roguetemple.hyperroid.yml b/metadata/com.roguetemple.hyperroid.yml
index 7aaa7470de..ddb9128182 100644
--- a/metadata/com.roguetemple.hyperroid.yml
+++ b/metadata/com.roguetemple.hyperroid.yml
@@ -223,20 +223,18 @@ Builds:
   - versionName: 12.0f
     versionCode: 12060
     disable: https://github.com/zenorogue/hyperrogue/issues/286
-    commit: dda9f29403693108f596229e6d335d079b44d226
+    commit: fa79d67016618af143a267d6fe0d6d85c18f7753
     subdir: hyperroid/app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y g++
+      - apt-get install -y g++ libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev
+        libglew-dev libpng-dev
     gradle:
       - yes
-    prebuild: sed -i -e "s/abiFilters .*/abiFilters 'x86', 'x86_64', 'armeabi-v7a',
-        'arm64-v8a'/" build.gradle
     build:
-      - pushd ..
+      - cd ..
       - bash copy.sh
-      - popd
-    ndk: r17c
+    ndk: r21e
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/com.secuso.privacyFriendlyCodeScanner.yml b/metadata/com.secuso.privacyFriendlyCodeScanner.yml
index 26cf0aab11..fd884707bd 100644
--- a/metadata/com.secuso.privacyFriendlyCodeScanner.yml
+++ b/metadata/com.secuso.privacyFriendlyCodeScanner.yml
@@ -81,6 +81,10 @@ Builds:
     versionCode: 23
     commit: 06b890fddb8bc4c27ed6e1d11bf5c0e2fc05636b
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/maven {/,+2d' ../build.gradle
diff --git a/metadata/com.simplemobiletools.smsmessenger.yml b/metadata/com.simplemobiletools.smsmessenger.yml
index d44399fddd..8d388e0c63 100644
--- a/metadata/com.simplemobiletools.smsmessenger.yml
+++ b/metadata/com.simplemobiletools.smsmessenger.yml
@@ -306,7 +306,7 @@ Builds:
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - yes
+      - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
 AutoUpdateMode: Version %v
diff --git a/metadata/de.kromke.andreas.opus1musicplayer.yml b/metadata/de.kromke.andreas.opus1musicplayer.yml
index 0aeeb18ea6..15882330cc 100644
--- a/metadata/de.kromke.andreas.opus1musicplayer.yml
+++ b/metadata/de.kromke.andreas.opus1musicplayer.yml
@@ -30,6 +30,10 @@ Builds:
     versionCode: 61
     commit: 530d43d9ced7f3d67eaabf7bc211157f3aac352d
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/de.rampro.activitydiary.yml b/metadata/de.rampro.activitydiary.yml
index 4d7a243d78..89510e18d5 100644
--- a/metadata/de.rampro.activitydiary.yml
+++ b/metadata/de.rampro.activitydiary.yml
@@ -109,8 +109,7 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 136
-    disable: https://github.com/ramack/ActivityDiary/issues/305
-    commit: 22593ca02b897132c5649f1219aa93448dc18b06
+    commit: 0b6a7c9de506be72070a120dc82d5c4562920e8d
     subdir: app
     sudo:
       - apt-get update || apt-get update
diff --git a/metadata/de.westnordost.streetcomplete.yml b/metadata/de.westnordost.streetcomplete.yml
index 28ef7719e3..6ab908b82b 100644
--- a/metadata/de.westnordost.streetcomplete.yml
+++ b/metadata/de.westnordost.streetcomplete.yml
@@ -11,15 +11,6 @@ Changelog: https://github.com/streetcomplete/StreetComplete/releases
 LiberapayID: '1625952'
 
 AutoName: Street­Complete
-Description: |-
-    Help to improve the OpenStreetMap with StreetComplete!
-
-    This app finds incomplete and extendable data in your vicinity and displays it
-    on a map as markers. Each of those is solvable by answering a simple question to
-    complete the info on site.
-
-    The info you enter is then directly added to the OpenStreetMap in your name,
-    without the need to use another editor.
 
 RepoType: git
 Repo: https://github.com/streetcomplete/StreetComplete.git
@@ -903,8 +894,13 @@ Builds:
 
   - versionName: '39.0'
     versionCode: 3901
+    disable: https://github.com/streetcomplete/StreetComplete/issues/3667
     commit: 5cec01cdafcd9d14a2c0a9e55ec67352855fbfdf
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/keystorePropertiesFile.*{/,/}/d; /keystorePropertiesFile/d'
diff --git a/metadata/fr.corenting.convertisseureurofranc.yml b/metadata/fr.corenting.convertisseureurofranc.yml
index c03cdcd9b2..d6da170063 100644
--- a/metadata/fr.corenting.convertisseureurofranc.yml
+++ b/metadata/fr.corenting.convertisseureurofranc.yml
@@ -59,6 +59,10 @@ Builds:
     versionCode: 19
     commit: ab4a5fdc4311cd1951ded6560c6f70e6d145e117
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/in.amfoss.raag.yml b/metadata/in.amfoss.raag.yml
index b5aedc6e59..31a9437290 100644
--- a/metadata/in.amfoss.raag.yml
+++ b/metadata/in.amfoss.raag.yml
@@ -105,9 +105,13 @@ Builds:
   - versionName: 1.1.0
     versionCode: 10
     commit: aab6e5362dbba4fe178941d04f435678ecacfcef
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.6.0-0.0.pre
+      - flutter@2.8.1
     rm:
       - ios
       - test
diff --git a/metadata/in.shick.diode.yml b/metadata/in.shick.diode.yml
index eb2471437d..8f8185435b 100644
--- a/metadata/in.shick.diode.yml
+++ b/metadata/in.shick.diode.yml
@@ -84,9 +84,22 @@ Builds:
     versionCode: 20
     commit: d1.2.3
 
-MaintainerNotes: Replace jar files before AUM!
+  - versionName: 1.3.2.2
+    versionCode: 26
+    commit: 6ad1dcd9690a00324e0c33fb9fa51259afd12b24
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs-dependencies
+      - app/libs
+    prebuild:
+      - sed -i -e '/google()/a mavenCentral()' ../build.gradle
+      - sed -i -e '/compile files/d' -e "/dependencies {/a implementation 'org.codehaus.jackson:jackson-core-asl:1.8.5'"
+        -e "/dependencies {/a implementation 'org.codehaus.jackson:jackson-mapper-asl:1.8.5'"
+        -e "/dependencies {/a implementation 'dk.brics:automaton:1.12-1'" build.gradle
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 1.3.2.2
 CurrentVersionCode: 26
diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml
index 0d37ee7475..3aaad0e870 100644
--- a/metadata/io.nekohasekai.sagernet.yml
+++ b/metadata/io.nekohasekai.sagernet.yml
@@ -605,8 +605,7 @@ Builds:
 
   - versionName: 0.7-rc02
     versionCode: 750
-    disable: https://github.com/SagerNet/SagerNet/issues/346
-    commit: f1cb7e67ad2c84bc5956cc2460935f7eb272544f
+    commit: 82cc9fde7e4de5e4244845e34ea3b2f3f32e0f7b
     subdir: app
     submodules: true
     sudo:
diff --git a/metadata/mobi.omegacentauri.SendReduced.yml b/metadata/mobi.omegacentauri.SendReduced.yml
index 05867fac34..c61cf31fd7 100644
--- a/metadata/mobi.omegacentauri.SendReduced.yml
+++ b/metadata/mobi.omegacentauri.SendReduced.yml
@@ -127,6 +127,17 @@ Builds:
     prebuild: sed -i -e 's/return context.getPackageName().toLowerCase().endsWith("pro")/return
         true/g' src/main/java/mobi/omegacentauri/SendReduced/SendReduced.java
 
+  - versionName: '0.27'
+    versionCode: 2700
+    commit: caa029dfbafab0529a6d1e88d69867487dd353a6
+    subdir: SendReduced
+    gradle:
+      - free
+    prebuild:
+      - echo 'android.useAndroidX=true' > gradle.properties
+      - sed -i -e 's/return context.getPackageName().toLowerCase().endsWith("pro")/return
+        true/g' src/main/java/mobi/omegacentauri/SendReduced/SendReduced.java
+
 MaintainerNotes: |-
     * OldRepo for 0.03 - 0.05: http://code.google.com/p/sendreduced/
     * <0.11 are MIT licensed
diff --git a/metadata/net.wigle.wigleandroid.yml b/metadata/net.wigle.wigleandroid.yml
index 9ccafeeb95..e8f321dd10 100644
--- a/metadata/net.wigle.wigleandroid.yml
+++ b/metadata/net.wigle.wigleandroid.yml
@@ -146,11 +146,14 @@ Builds:
     output: wiglewifiwardriving/build/outputs/apk/release/wiglewifiwardriving-release-unsigned.apk
     prebuild: sed -i -e '/TTS_library_stub.jar/d' build.gradle
 
-MaintainerNotes: |-
-    * Do we need to set Update Check Name?
-    * Not every release does make it into foss-master, so we might need to ask from time to time.
+  - versionName: '2.63'
+    versionCode: 263
+    commit: foss-2.63
+    subdir: wiglewifiwardriving
+    gradle:
+      - yes
 
-AutoUpdateMode: None
-UpdateCheckMode: RepoManifest/foss-master
+AutoUpdateMode: Version
+UpdateCheckMode: Tags foss-*
 CurrentVersion: '2.63'
 CurrentVersionCode: 263
diff --git a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
index a274f9e0ab..8f4d204da1 100644
--- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
+++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
@@ -320,18 +320,18 @@ Builds:
 
   - versionName: 1.6.0
     versionCode: 56
-    disable: ndk r23b
     commit: b3e348f12c17a7c9e19f6fefa1b0f18b22522cda
     subdir: app
     submodules: true
     sudo:
-      - /opt/android-sdk/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null
       - apt-get update || apt-get update
       - apt-get install -y libsqlite3-dev
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
+        'cmake;3.18.1' > /dev/null
     ndk: r23b
 
 AutoUpdateMode: Version %v
diff --git a/metadata/org.scoutant.rpn.yml b/metadata/org.scoutant.rpn.yml
index d140927eb4..eb5ae235e4 100644
--- a/metadata/org.scoutant.rpn.yml
+++ b/metadata/org.scoutant.rpn.yml
@@ -34,8 +34,7 @@ Builds:
 
   - versionName: '1.3'
     versionCode: 4
-    disable: https://github.com/scoutant/rpn/issues/11
-    commit: c6e6cabe0d01c8870fa59c68af55227d27365b54
+    commit: 4ae52914c5b8510580ce173b0ebcc4b95207b153
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -43,7 +42,6 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
-    output: build/outputs/apk/release/rpn-*-release-unsigned.apk
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/tranquvis.simplesmsremote.yml b/metadata/tranquvis.simplesmsremote.yml
index 75717cbe59..cec19ac33f 100644
--- a/metadata/tranquvis.simplesmsremote.yml
+++ b/metadata/tranquvis.simplesmsremote.yml
@@ -107,7 +107,19 @@ Builds:
       - tranquvis.directorypicker
     prebuild: cp -fR $$tranquisdirpicker$$/app ../tranquvis.directorypicker
 
-AutoUpdateMode: None
-UpdateCheckMode: RepoManifest
+  - versionName: 1.4.0
+    versionCode: 140
+    commit: f70ae89124f134600bb9f574637d87d14230385f
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - tranquisdirpicker@c2e29f8d0d88376f5e26b9ab8cc4b475e6664bf1
+    rm:
+      - tranquvis.directorypicker
+    prebuild: cp -fR $$tranquisdirpicker$$/app ../tranquvis.directorypicker
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
 CurrentVersion: 1.4.0
 CurrentVersionCode: 140