diff --git a/metadata/ac.mdiq.podcini.R.yml b/metadata/ac.mdiq.podcini.R.yml
index 2b583edc75..fd9728ab5b 100644
--- a/metadata/ac.mdiq.podcini.R.yml
+++ b/metadata/ac.mdiq.podcini.R.yml
@@ -8,7 +8,7 @@ IssueTracker: https://github.com/XilinJia/Podcini/issues
 
 RepoType: git
 Repo: https://github.com/XilinJia/Podcini.git
-Binaries: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
+Binaries: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_free_release_%v_universal.apk
 
 Builds:
   - versionName: 6.0.12
@@ -17,6 +17,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -26,6 +27,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -35,6 +37,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -44,6 +47,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -53,6 +57,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -62,6 +67,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -71,6 +77,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -80,6 +87,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -89,6 +97,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -98,6 +107,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -107,6 +117,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -116,15 +127,7 @@ Builds:
     subdir: app
     gradle:
       - free
-    prebuild: sed -i -e '/wearable/d' build.gradle
-    ndk: r26d
-
-  - versionName: 6.5.0
-    versionCode: 3020233
-    commit: 72b85fe1caa0efb88845be3e921aacf268e67574
-    subdir: app
-    gradle:
-      - free
+    binary: https://github.com/XilinJia/Podcini/releases/download/%v/Podcini.R_release_free_%v.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
@@ -134,6 +137,7 @@ Builds:
     subdir: app
     gradle:
       - free
+    output: build/outputs/apk/free/release/Podcini.R_free_release_*_universal.apk
     prebuild: sed -i -e '/wearable/d' build.gradle
     ndk: r26d
 
diff --git a/metadata/chat.delta.lite.yml b/metadata/chat.delta.lite.yml
index a969e4d070..6b63d14444 100644
--- a/metadata/chat.delta.lite.yml
+++ b/metadata/chat.delta.lite.yml
@@ -12,94 +12,6 @@ Repo: https://github.com/ArcaneChat/android.git
 Binaries: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-arm64-v8a-%v.apk
 
 Builds:
-  - versionName: 1.46.16
-    versionCode: 300006881
-    commit: v1.46.16
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-armeabi-v7a-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target armv7-linux-androideabi
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh armeabi-v7a
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=armeabi-v7a
-
-  - versionName: 1.46.16
-    versionCode: 300006882
-    commit: v1.46.16
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-arm64-v8a-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target aarch64-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh arm64-v8a
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=arm64-v8a
-
-  - versionName: 1.46.16
-    versionCode: 300006883
-    commit: v1.46.16
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target i686-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh x86
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=x86
-
-  - versionName: 1.46.16
-    versionCode: 300006884
-    commit: v1.46.16
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86_64-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target x86_64-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh x86_64
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=x86_64
-
   - versionName: 1.46.17
     versionCode: 300006891
     commit: 6fa725e8ff005c38460b977005288e0e2f131913
diff --git a/metadata/com.dessalines.thumbkey.yml b/metadata/com.dessalines.thumbkey.yml
index e92215d6b4..bfe9a42ae7 100644
--- a/metadata/com.dessalines.thumbkey.yml
+++ b/metadata/com.dessalines.thumbkey.yml
@@ -406,14 +406,6 @@ Builds:
       - yes
     prebuild: sed -i -e 's/1024/2048/' ../gradle.properties
 
-  - versionName: 3.4.3
-    versionCode: 104
-    commit: 97032cbcfe159187a95b3c998eeb3e65da9cfa02
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e 's/1024/2048/' ../gradle.properties
-
   - versionName: 3.4.4
     versionCode: 105
     commit: 6f03303edaa4ddc299a996c0d004d8a121256d6f
diff --git a/metadata/com.elasticrock.keepscreenon.yml b/metadata/com.elasticrock.keepscreenon.yml
index eba34dbec3..a1ed1eacba 100644
--- a/metadata/com.elasticrock.keepscreenon.yml
+++ b/metadata/com.elasticrock.keepscreenon.yml
@@ -286,20 +286,9 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-newlines
       $$OUT$$ 'META-INF/services/*'
 
-  - versionName: 1.18.3
-    versionCode: 29
-    disable: https://github.com/elastic-rock/KeepScreenOn/issues/26#issuecomment-2275744106
-    commit: ea09b452735135e10bf631b5c95fe5bcc4882e53
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - reproducible-apk-tools@v0.2.6
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-newlines
-      $$OUT$$ 'META-INF/services/*'
-
   - versionName: 1.19.0
     versionCode: 30
+    disable: https://github.com/elastic-rock/KeepScreenOn/issues/26#issuecomment-2275744106
     commit: 884e716d6f81eaa586cef6b381f9e253f135d054
     subdir: app
     gradle:
diff --git a/metadata/com.greenart7c3.nostrsigner.yml b/metadata/com.greenart7c3.nostrsigner.yml
index 5b51f7f73d..b1ceef33b0 100644
--- a/metadata/com.greenart7c3.nostrsigner.yml
+++ b/metadata/com.greenart7c3.nostrsigner.yml
@@ -107,14 +107,6 @@ Builds:
       - free
     prebuild: sed -i -e '/enable true/d' build.gradle
 
-  - versionName: 1.3.4
-    versionCode: 88
-    commit: c47634ab9ff53e971ac8f4e659f2227c409f0342
-    subdir: app
-    gradle:
-      - free
-    prebuild: sed -i -e '/enable true/d' build.gradle
-
   - versionName: 1.3.6
     versionCode: 90
     commit: 4883d364d02c3b9df3ab79b3c40820bdedbce2eb
diff --git a/metadata/com.madlonkay.orgro.yml b/metadata/com.madlonkay.orgro.yml
index b91c5cdc14..963078751a 100644
--- a/metadata/com.madlonkay.orgro.yml
+++ b/metadata/com.madlonkay.orgro.yml
@@ -570,28 +570,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - flutter/bin/flutter build apk --dart-define=ORGRO_VERSION=$$VERSION$$
 
-  - versionName: 1.38.0
-    versionCode: 94
-    disable: https://github.com/amake/orgro/issues/100
-    commit: d0ad5006ffd4d2413cb806aa6403d19c315b9f47
-    submodules: true
-    output: build/app/outputs/flutter-apk/app-release.apk
-    prebuild:
-      - touch android/key.properties
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-    scanignore:
-      - flutter/packages/flutter_tools/gradle/resolve_dependencies.gradle
-      - flutter/packages/flutter_tools/gradle/aar_init_script.gradle
-      - flutter/bin/cache
-    scandelete:
-      - flutter
-      - .pub-cache
-    build:
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --dart-define=ORGRO_VERSION=$$VERSION$$
-
   - versionName: 1.39.2
     versionCode: 97
     commit: 94d536e20bcac8be99415f9595974182a71df186
diff --git a/metadata/com.mirfatif.permissionmanagerx.yml b/metadata/com.mirfatif.permissionmanagerx.yml
index 7e99e8dee9..4c332dcd66 100644
--- a/metadata/com.mirfatif.permissionmanagerx.yml
+++ b/metadata/com.mirfatif.permissionmanagerx.yml
@@ -188,7 +188,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless make gcc libc-dev
+      - apt-get install -y make gcc libc-dev
     gradle:
       - fdroid
       - foss
diff --git a/metadata/com.nikola.jakshic.dagger.yml b/metadata/com.nikola.jakshic.dagger.yml
index 758123524c..10f7fa4c4b 100644
--- a/metadata/com.nikola.jakshic.dagger.yml
+++ b/metadata/com.nikola.jakshic.dagger.yml
@@ -141,6 +141,8 @@ Builds:
     subdir: app
     gradle:
       - yes
+    rm:
+      - libs
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.vitorpamplona.amethyst.yml b/metadata/com.vitorpamplona.amethyst.yml
index 5a5fe7b7d4..2eab7ebac7 100644
--- a/metadata/com.vitorpamplona.amethyst.yml
+++ b/metadata/com.vitorpamplona.amethyst.yml
@@ -958,14 +958,6 @@ Builds:
       - fdroid
     prebuild: sed -i -e '/enable true/d' build.gradle
 
-  - versionName: 0.90.3
-    versionCode: 400
-    commit: 0b2a9e67c05e781611990d756d726a8f331c67ae
-    subdir: amethyst
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/enable true/d' build.gradle
-
   - versionName: 0.90.4
     versionCode: 401
     commit: b1f1466e6b998db2cb680186469e414c2c83e162
diff --git a/metadata/com.ztftrue.music.yml b/metadata/com.ztftrue.music.yml
index 58b8d055ab..630e656feb 100644
--- a/metadata/com.ztftrue.music.yml
+++ b/metadata/com.ztftrue.music.yml
@@ -55,13 +55,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.1.26
-    versionCode: 26
-    commit: 75a3bda62241cbca463560f42f3a09adf59a6560
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 0.1.27
     versionCode: 27
     commit: 99af2d1a2304a1bf2b2669d3f6227e03db63d0b1
diff --git a/metadata/de.hbch.traewelling.yml b/metadata/de.hbch.traewelling.yml
index 2c776b570f..93c33b70bd 100644
--- a/metadata/de.hbch.traewelling.yml
+++ b/metadata/de.hbch.traewelling.yml
@@ -160,13 +160,6 @@ Builds:
     gradle:
       - foss
 
-  - versionName: 2.14.0
-    versionCode: 164
-    commit: 74cfc23f50f7704dcb92398031a0c63f5e1f133e
-    subdir: app
-    gradle:
-      - foss
-
   - versionName: 2.14.1
     versionCode: 165
     commit: 872e646af8a63c96649323f809653e7692c0f7a0
diff --git a/metadata/de.schildbach.oeffi.yml b/metadata/de.schildbach.oeffi.yml
index 84b943c211..057df92031 100644
--- a/metadata/de.schildbach.oeffi.yml
+++ b/metadata/de.schildbach.oeffi.yml
@@ -941,28 +941,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 13.0.2
-    versionCode: 130002
-    commit: efa91b4c67d5edcf81477c01995960e8f620b048
-    subdir: oeffi
-    submodules: true
-    sudo:
-      - ln -fs /usr/share/zoneinfo/CET /etc/localtime
-      - dpkg-reconfigure -f noninteractive tzdata
-      - apt-get update
-      - apt-get install -y gradle disorderfs
-    init:
-      - rm /home/vagrant/fdroidserver/gradlew-fdroid
-      - ln -s /usr/bin/gradle /home/vagrant/fdroidserver/gradlew-fdroid
-      - cd ../..
-      - mv de.schildbach.oeffi de.schildbach.oeffi_underlying
-      - mkdir de.schildbach.oeffi
-      - disorderfs --sort-dirents=yes --reverse-dirents=no de.schildbach.oeffi_underlying
-        de.schildbach.oeffi
-      - cd de.schildbach.oeffi/oeffi
-    gradle:
-      - yes
-
   - versionName: 13.0.3
     versionCode: 130003
     commit: 4357b7a0df446f0b66d82c14774388f479ba32f3
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index d80a018255..817f89c499 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -7669,17 +7669,6 @@ Builds:
     scandelete:
       - app/lib
 
-  - versionName: '1.2226'
-    versionCode: 2226
-    commit: 98db81a84c75988d2ede343b731657c2a24a9358
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sdkmanager 'cmake;3.22.1'
-    scandelete:
-      - app/lib
-
   - versionName: '1.2227'
     versionCode: 2227
     commit: 6610dfe1f3c64b1bff4835e100a8242bcf7aed01
diff --git a/metadata/io.github.antoinepirlot.satunes.yml b/metadata/io.github.antoinepirlot.satunes.yml
index 47ab9867da..142322d803 100644
--- a/metadata/io.github.antoinepirlot.satunes.yml
+++ b/metadata/io.github.antoinepirlot.satunes.yml
@@ -137,9 +137,9 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
       'META-INF/services/*'
 
-  - versionName: 2.2.0
-    versionCode: 47
-    commit: d7086282642f2462ae922206f24375ca3dd0d967
+  - versionName: 2.2.1
+    versionCode: 48
+    commit: 451eee8e020ce8dcf2a37202e6bf1e82b263eace
     subdir: app
     submodules: true
     gradle:
@@ -154,5 +154,5 @@ AllowedAPKSigningKeys: 7ee0df5b3a800a2239987697d8396ecf176c9ef8a7068893fa1e8852c
 AutoUpdateMode: Version
 UpdateCheckMode: Tags v[\d.]+$
 UpdateCheckData: app/build.gradle.kts|versionCode = (\d+)|.|versionName = "(.*)"
-CurrentVersion: 2.2.0
-CurrentVersionCode: 47
+CurrentVersion: 2.2.1
+CurrentVersionCode: 48
diff --git a/metadata/io.github.benderblog.traintime_pda.yml b/metadata/io.github.benderblog.traintime_pda.yml
index b458e46a24..ece2cb2dc8 100644
--- a/metadata/io.github.benderblog.traintime_pda.yml
+++ b/metadata/io.github.benderblog.traintime_pda.yml
@@ -821,6 +821,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 221
+    disable: https://github.com/BenderBlog/traintime_pda/issues/43
     commit: c197092f0c5fc67920624a7e82eed2b958f03e50
     submodules: true
     sudo:
@@ -863,6 +864,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 222
+    disable: https://github.com/BenderBlog/traintime_pda/issues/43
     commit: c197092f0c5fc67920624a7e82eed2b958f03e50
     submodules: true
     sudo:
@@ -905,6 +907,7 @@ Builds:
 
   - versionName: 1.3.0
     versionCode: 223
+    disable: https://github.com/BenderBlog/traintime_pda/issues/43
     commit: c197092f0c5fc67920624a7e82eed2b958f03e50
     submodules: true
     sudo:
diff --git a/metadata/io.theoneapp.yml b/metadata/io.theoneapp.yml
index c1202406b4..6e7d2f9a4d 100644
--- a/metadata/io.theoneapp.yml
+++ b/metadata/io.theoneapp.yml
@@ -2,11 +2,11 @@ Categories:
   - Games
 License: AGPL-3.0-or-later
 AuthorName: Loikki
-SourceCode: https://gitlab.com/loikki/the-one-app
-IssueTracker: https://gitlab.com/loikki/the-one-app/-/issues
+SourceCode: https://gitlab.com/the-one-app/the-one-app
+IssueTracker: https://gitlab.com/the-one-app/the-one-app/-/issues
 
 RepoType: git
-Repo: https://gitlab.com/loikki/the-one-app.git
+Repo: https://gitlab.com/the-one-app/the-one-app.git
 
 Builds:
   - versionName: 1.1.1
@@ -491,7 +491,7 @@ Builds:
 
   - versionName: 1.1.4
     versionCode: 61
-    commit: 1.1.4
+    commit: 65baa1543363129e129eca4a7bccabde148431dd
     sudo:
       - apt-get update
       - apt-get install -y npm make gcc libc-dev golang-go
@@ -500,9 +500,6 @@ Builds:
       - rustup@1.27.0
       - esbuild@v0.21.5
     prebuild:
-      - source versions
-      - sed -i 's/\"versionCode\":[0-9]\+/&1/' tauri.conf.json
-      - sed -i 's/versionCode=\"[0-9]\+/&1/' android-files/AndroidManifest.xml
       - cd frontend
       - npm install
       - cd ..
@@ -515,6 +512,8 @@ Builds:
       - rm -rf gen/android
       - cargo tauri android init
       - cargo tauri icon icon.png
+      - sed -i 's/versionCode=\"[0-9]\+/&1/' android-files/AndroidManifest.xml
+      - sed -i 's/versionCode = [0-9]\+/&1/' android-files/build.gradle.kts
       - ./copy-android
     scandelete:
       - frontend/node_modules
@@ -532,7 +531,7 @@ Builds:
 
   - versionName: 1.1.4
     versionCode: 62
-    commit: 1.1.4
+    commit: 65baa1543363129e129eca4a7bccabde148431dd
     sudo:
       - apt-get update
       - apt-get install -y npm make gcc libc-dev golang-go
@@ -541,9 +540,6 @@ Builds:
       - rustup@1.27.0
       - esbuild@v0.21.5
     prebuild:
-      - source versions
-      - sed -i 's/\"versionCode\":[0-9]\+/&2/' tauri.conf.json
-      - sed -i 's/versionCode=\"[0-9]\+/&2/' android-files/AndroidManifest.xml
       - cd frontend
       - npm install
       - cd ..
@@ -556,6 +552,8 @@ Builds:
       - rm -rf gen/android
       - cargo tauri android init
       - cargo tauri icon icon.png
+      - sed -i 's/versionCode=\"[0-9]\+/&2/' android-files/AndroidManifest.xml
+      - sed -i 's/versionCode = [0-9]\+/&2/' android-files/build.gradle.kts
       - ./copy-android
     scandelete:
       - frontend/node_modules
@@ -573,7 +571,7 @@ Builds:
 
   - versionName: 1.1.4
     versionCode: 63
-    commit: 1.1.4
+    commit: 65baa1543363129e129eca4a7bccabde148431dd
     sudo:
       - apt-get update
       - apt-get install -y npm make gcc libc-dev golang-go
@@ -582,9 +580,6 @@ Builds:
       - rustup@1.27.0
       - esbuild@v0.21.5
     prebuild:
-      - source versions
-      - sed -i 's/\"versionCode\":[0-9]\+/&3/' tauri.conf.json
-      - sed -i 's/versionCode=\"[0-9]\+/&3/' android-files/AndroidManifest.xml
       - cd frontend
       - npm install
       - cd ..
@@ -597,6 +592,8 @@ Builds:
       - rm -rf gen/android
       - cargo tauri android init
       - cargo tauri icon icon.png
+      - sed -i 's/versionCode=\"[0-9]\+/&3/' android-files/AndroidManifest.xml
+      - sed -i 's/versionCode = [0-9]\+/&3/' android-files/build.gradle.kts
       - ./copy-android
     scandelete:
       - frontend/node_modules
@@ -614,7 +611,7 @@ Builds:
 
   - versionName: 1.1.4
     versionCode: 64
-    commit: 1.1.4
+    commit: 65baa1543363129e129eca4a7bccabde148431dd
     sudo:
       - apt-get update
       - apt-get install -y npm make gcc libc-dev golang-go
@@ -623,9 +620,6 @@ Builds:
       - rustup@1.27.0
       - esbuild@v0.21.5
     prebuild:
-      - source versions
-      - sed -i 's/\"versionCode\":[0-9]\+/&4/' tauri.conf.json
-      - sed -i 's/versionCode=\"[0-9]\+/&4/' android-files/AndroidManifest.xml
       - cd frontend
       - npm install
       - cd ..
@@ -638,6 +632,8 @@ Builds:
       - rm -rf gen/android
       - cargo tauri android init
       - cargo tauri icon icon.png
+      - sed -i 's/versionCode=\"[0-9]\+/&4/' android-files/AndroidManifest.xml
+      - sed -i 's/versionCode = [0-9]\+/&4/' android-files/build.gradle.kts
       - ./copy-android
     scandelete:
       - frontend/node_modules
diff --git a/metadata/net.christianbeier.droidvnc_ng.yml b/metadata/net.christianbeier.droidvnc_ng.yml
index d04dc6663f..a2c6d9d358 100644
--- a/metadata/net.christianbeier.droidvnc_ng.yml
+++ b/metadata/net.christianbeier.droidvnc_ng.yml
@@ -377,16 +377,6 @@ Builds:
     prebuild: sdkmanager 'cmake;3.10.2.4988404'
     ndk: 26.1.10909125
 
-  - versionName: 2.7.0
-    versionCode: 36
-    commit: 7cfe414b59905890331a58d067b6d36ece456fd9
-    subdir: app
-    submodules: true
-    gradle:
-      - yes
-    prebuild: sdkmanager 'cmake;3.10.2.4988404'
-    ndk: 26.1.10909125
-
   - versionName: 2.7.1
     versionCode: 37
     commit: e8877a30555575bc07ea0bbe60602437d210ddd4
diff --git a/metadata/nl.eduvpn.app.yml b/metadata/nl.eduvpn.app.yml
index bb7ed5b22c..6758f0f0ef 100644
--- a/metadata/nl.eduvpn.app.yml
+++ b/metadata/nl.eduvpn.app.yml
@@ -207,25 +207,6 @@ Builds:
       - ics-openvpn/main/src/main/cpp/lz4
     ndk: r26b
 
-  - versionName: 3.3.1
-    versionCode: 28
-    commit: 67b25714d1d2951415e4b52a4d52319de4a816c0
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y golang-go make swig
-    gradle:
-      - basic
-    output: app/build/outputs/apk/basic/release/app-basic-release-unsigned.apk
-    rm:
-      - ics-openvpn/main/src/main/cpp/mbedtls/programs/fuzz
-      - ics-openvpn/main/src/main/cpp/mbedtls/tests
-      - ics-openvpn/main/src/main/cpp/openvpn3/test/unittests
-    prebuild: sed -i -e '/signingConfigs/d' ics-openvpn/main/build.gradle.kts
-    scandelete:
-      - ics-openvpn/main/src/main/cpp/lz4
-    ndk: r26b
-
   - versionName: 3.3.2
     versionCode: 29
     commit: 069b68ee4a4f9b5ed8dae1ce79335c5501d93b79
diff --git a/metadata/org.akanework.gramophone.yml b/metadata/org.akanework.gramophone.yml
index d59b767b3a..264927d907 100644
--- a/metadata/org.akanework.gramophone.yml
+++ b/metadata/org.akanework.gramophone.yml
@@ -47,9 +47,14 @@ Builds:
     versionCode: 11
     commit: 951ed87bb5bb3928b9298141becaec76ef7b65c0
     subdir: app
+    submodules: true
     gradle:
       - yes
+    srclibs:
+      - reproducible-apk-tools@v0.2.8
     prebuild: echo 'releaseType=Release' > ../package.properties
+    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
+      'META-INF/services/*'
 
 AllowedAPKSigningKeys: f451197ad7b80bd1bc981ba38a2c49d471856fb38bcc333676d6e8f8f3ce5d6e
 
diff --git a/metadata/org.ostrya.presencepublisher.yml b/metadata/org.ostrya.presencepublisher.yml
index 20bcd4eeb5..bfa40526e5 100644
--- a/metadata/org.ostrya.presencepublisher.yml
+++ b/metadata/org.ostrya.presencepublisher.yml
@@ -275,14 +275,6 @@ Builds:
       - yes
     prebuild: sed -i -e '/signingConfig/d' build.gradle.kts
 
-  - versionName: 2.6.0
-    versionCode: 52
-    commit: 11135cbb46b1a9ac93ba65acf4b0cf70a483a791
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/signingConfig/d' build.gradle.kts
-
   - versionName: 2.6.1
     versionCode: 53
     commit: cc1ba8e50957cf96a03475dfaa91cc0792c6b6be
diff --git a/metadata/org.smc.inputmethod.indic.yml b/metadata/org.smc.inputmethod.indic.yml
index 5561fc4cc3..4494b128de 100644
--- a/metadata/org.smc.inputmethod.indic.yml
+++ b/metadata/org.smc.inputmethod.indic.yml
@@ -411,54 +411,10 @@ Builds:
       - mv ../native/libs/* jniLibs/
     ndk: r21e
 
-  - versionName: 3.6.0
-    versionCode: 107
-    commit: efa93db980da6a4eed472f5bdd5ee2274dc04477
-    subdir: java
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y file make
-    gradle:
-      - yes
-    prebuild: sed -i 's/include .*/include "x86"/' build.gradle
-    scanignore:
-      - dictionaries/*.combined.gz
-    scandelete:
-      - dictionaries-indic/
-      - java/jniLibs/
-    build:
-      - $$NDK$$/ndk-build -e "APP_ABI=x86" -e "APP_CFLAGS += -w" -C ../native/jni
-      - mv ../native/libs/* jniLibs/
-    ndk: r21e
-
-  - versionName: 3.6.0
-    versionCode: 108
-    commit: efa93db980da6a4eed472f5bdd5ee2274dc04477
-    subdir: java
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y file make
-    gradle:
-      - yes
-    prebuild: sed -i 's/include .*/include "x86_64"/' build.gradle
-    scanignore:
-      - dictionaries/*.combined.gz
-    scandelete:
-      - dictionaries-indic/
-      - java/jniLibs/
-    build:
-      - $$NDK$$/ndk-build -e "APP_ABI=x86_64" -e "APP_CFLAGS += -w" -C ../native/jni
-      - mv ../native/libs/* jniLibs/
-    ndk: r21e
-
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 VercodeOperation:
   - '%c'
   - '%c + 1'
-  - '%c + 2'
-  - '%c + 3'
 CurrentVersion: 3.6.0
-CurrentVersionCode: 108
+CurrentVersionCode: 106