diff --git a/metadata/br.com.colman.petals.yml b/metadata/br.com.colman.petals.yml
index 033533fdc0..82e79b8d36 100644
--- a/metadata/br.com.colman.petals.yml
+++ b/metadata/br.com.colman.petals.yml
@@ -67,10 +67,6 @@ Builds:
     versionCode: 3102
     commit: 70e952c6ee2742bdc2bab815b7139c9b80a6bf10
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/sonatype/d' build.gradle.kts
diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 298d076392..ed7b7ea835 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -1596,14 +1596,14 @@ Builds:
       - src/ui/qt
       - resources
       - tests
-    prebuild: mv build.gradle_fdroid build.gradle
+    prebuild: mv android/app/build.gradle_fdroid android/app/build.gradle
     build:
       - export PATH=$$flutter$$/bin:$PATH
       - pushd ../../..
       - ./flutter-init.sh
       - popd
       - flutter config --no-analytics
-      - flutter build apk -v --flavor fdroid
+      - flutter build apk --flavor fdroid
     ndk: r21e
 
 MaintainerNotes: |-
diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 2f3e5a80c5..32366e36ec 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -259,8 +259,8 @@ Builds:
 
   - versionName: 8.8.1-fdroid
     versionCode: 4842
-    commit: 99af91393db21b271370188dc68fd93f15d4b2a2
     disable: https://github.com/foobnix/LibreraReader/issues/960
+    commit: 99af91393db21b271370188dc68fd93f15d4b2a2
     subdir: app
     sudo:
       - apt-get update
diff --git a/metadata/com.katiearose.sobriety.yml b/metadata/com.katiearose.sobriety.yml
index 1284306c45..91f9363762 100644
--- a/metadata/com.katiearose.sobriety.yml
+++ b/metadata/com.katiearose.sobriety.yml
@@ -42,10 +42,6 @@ Builds:
     versionCode: 13
     commit: 437ac372ba7ff8c89918ee38b5a24baa34993a55
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e 's/VERSION_16/VERSION_11/g' build.gradle
diff --git a/metadata/com.nextcloud.talk2.yml b/metadata/com.nextcloud.talk2.yml
index 9b6a444352..8009f26d40 100644
--- a/metadata/com.nextcloud.talk2.yml
+++ b/metadata/com.nextcloud.talk2.yml
@@ -560,18 +560,10 @@ Builds:
     versionCode: 150000090
     commit: 2266c8535bfa93b56a9d1d72e518d5211b6513da
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - generic
-    prebuild: sed -i -e '/work-firebase/d' build.gradle
 
-MaintainerNotes: https://github.com/nextcloud/talk-android/issues/534.
-
-ArchivePolicy: 5 versions
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$
+AutoUpdateMode: Version
+UpdateCheckMode: Tags ^v[\d.]+$
 CurrentVersion: 15.0.0
 CurrentVersionCode: 150000090
diff --git a/metadata/com.ominous.quickweather.yml b/metadata/com.ominous.quickweather.yml
index d2d29e474c..2f885735fb 100644
--- a/metadata/com.ominous.quickweather.yml
+++ b/metadata/com.ominous.quickweather.yml
@@ -182,10 +182,6 @@ Builds:
     versionCode: 51
     commit: f359cb3188ae0b73ea791a11e6e144932e8fcb01
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.simplemobiletools.gallery.pro.yml b/metadata/com.simplemobiletools.gallery.pro.yml
index 15c181cd9a..a40e97804f 100644
--- a/metadata/com.simplemobiletools.gallery.pro.yml
+++ b/metadata/com.simplemobiletools.gallery.pro.yml
@@ -1090,13 +1090,11 @@ Builds:
     versionCode: 379
     commit: 16f9f8995f898ddded5c0c6ab1a3760550b3484e
     subdir: app
-    patch:
-      - build.patch
     gradle:
       - foss
     prebuild: sed -i -e '/(is_proprietary)/,+2d' ../build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 6.25.4
 CurrentVersionCode: 379
diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml
index a41b3e9095..1dea8abae3 100644
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@@ -7556,9 +7556,9 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 3.43.5
-    versionCode: 3000559
-    commit: '@standardnotes/mobile@3.43.5'
+  - versionName: 3.43.9
+    versionCode: 3000563
+    commit: '@standardnotes/mobile@3.43.9'
     subdir: packages/mobile/android/app
     sudo:
       - apt-get update
@@ -7570,22 +7570,18 @@ Builds:
       - npm install -g yarn
       - sysctl fs.inotify.max_user_watches=524288 || true
     init:
-      - pushd ../../../..
+      - cd ../../../..
       - npm_config_build_from_source=true yarn --immutable
-      - popd
-      - pushd ../..
+      - cd packages/mobile
       - npm_config_build_from_source=true yarn --immutable
-      - yarn remove react-native-store-review
-      - popd
-    patch:
-      - disable-splits-abi.patch
-      - remove-gms.patch
     gradle:
       - prod
     rm:
       - packages/desktop
+      - packages/mobile/ios
     prebuild: sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/'
-        -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' build.gradle
+        -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' -e '/universalApk/s/false/true/'
+        build.gradle
     scanignore:
       - packages/mobile/android/build.gradle
       - packages/mobile/node_modules/hermes-engine
@@ -7594,10 +7590,7 @@ Builds:
       - packages/mobile/node_modules/detox/android/build.gradle
       - packages/mobile/node_modules/detox/android/detox/publishing.gradle
       - packages/mobile/node_modules/@react-native-community/async-storage/android/build.gradle
-      - packages/mobile/node_modules/@react-native-community/masked-view/android/build.gradle
       - packages/mobile/node_modules/@standardnotes/react-native-utils/android/build.gradle
-      - packages/mobile/node_modules/@standardnotes/react-native-textview/android/build.gradle
-      - packages/mobile/node_modules/@standardnotes/react-native-aes/android/build.gradle
     scandelete:
       - node_modules/
       - packages/mobile/node_modules
@@ -7612,66 +7605,9 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 3.43.8
-    versionCode: 3000562
-    commit: '@standardnotes/mobile@3.43.8'
-    subdir: packages/mobile/android/app
-    sudo:
-      - apt-get update
-      - apt-get install -y libsecret-1-dev build-essential
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz
-      - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz"
-        | sha256sum -c -
-      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
-      - npm install -g yarn
-      - sysctl fs.inotify.max_user_watches=524288 || true
-    init:
-      - pushd ../../../..
-      - npm_config_build_from_source=true yarn --immutable
-      - popd
-      - pushd ../..
-      - npm_config_build_from_source=true yarn --immutable
-      - yarn remove react-native-store-review
-      - popd
-    patch:
-      - disable-splits-abi.patch
-      - remove-gms.patch
-    gradle:
-      - prod
-    rm:
-      - packages/desktop
-    prebuild: sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/'
-        -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' build.gradle
-    scanignore:
-      - packages/mobile/android/build.gradle
-      - packages/mobile/node_modules/hermes-engine
-      - packages/mobile/node_modules/jsc-android
-      - packages/mobile/node_modules/react-native
-      - packages/mobile/node_modules/detox/android/build.gradle
-      - packages/mobile/node_modules/detox/android/detox/publishing.gradle
-      - packages/mobile/node_modules/@react-native-community/async-storage/android/build.gradle
-      - packages/mobile/node_modules/@react-native-community/masked-view/android/build.gradle
-      - packages/mobile/node_modules/@standardnotes/react-native-utils/android/build.gradle
-      - packages/mobile/node_modules/@standardnotes/react-native-textview/android/build.gradle
-      - packages/mobile/node_modules/@standardnotes/react-native-aes/android/build.gradle
-    scandelete:
-      - node_modules/
-      - packages/mobile/node_modules
-      - packages/components/dist
-      - .yarn/
-    build:
-      - pushd ../../../..
-      - yarn run build:mobile
-      - popd
-      - pushd ../..
-      - yarn run android:bundle
-      - popd
-    ndk: r21e
-
-ArchivePolicy: 4 versions
 AutoUpdateMode: Version @standardnotes/mobile@%v
 UpdateCheckMode: HTTP
 VercodeOperation: 3000310 + %c
 UpdateCheckData: https://github.com/standardnotes/app/actions/workflows/mobile.release.prod.yml|(\d+)\sworkflow\sruns|https://github.com/standardnotes/app/releases|/releases/tag/%40standardnotes%2Fmobile%40([\d.]+)
-CurrentVersion: 3.43.8
-CurrentVersionCode: 3000562
+CurrentVersion: 3.43.9
+CurrentVersionCode: 3000563
diff --git a/metadata/de.jepfa.yapm.yml b/metadata/de.jepfa.yapm.yml
index 6a4f58058e..7354863afd 100644
--- a/metadata/de.jepfa.yapm.yml
+++ b/metadata/de.jepfa.yapm.yml
@@ -95,10 +95,6 @@ Builds:
     versionCode: 107001
     commit: 1dcea1a91381f26ae3fc3e556c4ff5b8d92254bf
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml
index 07c15128a0..7799415118 100644
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@@ -861,6 +861,7 @@ Builds:
     prebuild:
       - sdkmanager 'cmake;3.10.2.4988404'
       - sed -i -e "/:proprietary/d" ../settings.gradle build.gradle
+      - sed -i -e '/gms/d' -e '/firebase/d' ../build.gradle
     ndk: r21
 
 AutoUpdateMode: Version %v
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index f0a848f8dd..44dde5ff02 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -5078,20 +5078,6 @@ Builds:
       - app/lib
     ndk: r25
 
-  - versionName: '1.1984'
-    versionCode: 1984
-    commit: f89c07778290d2ff491877c1632b7b0b082a54fc
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
   - versionName: '1.1985'
     versionCode: 1985
     commit: 25352a9fe58d45c94dae57c4c090fe52fd7e97f7
@@ -5101,10 +5087,10 @@ Builds:
       - fdroid
     prebuild:
       - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - sdkmanager 'cmake;3.10.2.4988404'
+      - sdkmanager 'cmake;3.22.1'
     scandelete:
       - app/lib
-    ndk: r25
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/info.plateaukao.einkbro.yml b/metadata/info.plateaukao.einkbro.yml
index 5ef4d0e50a..23034d5cf7 100644
--- a/metadata/info.plateaukao.einkbro.yml
+++ b/metadata/info.plateaukao.einkbro.yml
@@ -585,14 +585,10 @@ Builds:
     versionCode: 91000
     commit: 3ea44e07ffa4e8e8769ab65336cffd4293dbf652
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 9.10.0
 CurrentVersionCode: 91000
diff --git a/metadata/io.bmaupin.pitchpipe.yml b/metadata/io.bmaupin.pitchpipe.yml
index 3d841d5e3f..5c21edba19 100644
--- a/metadata/io.bmaupin.pitchpipe.yml
+++ b/metadata/io.bmaupin.pitchpipe.yml
@@ -50,10 +50,6 @@ Builds:
     versionCode: 8
     commit: db43c50464e6a68ebd5e0abd0892f73e6b30c6d3
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/io.github.divverent.aaaaxy.yml b/metadata/io.github.divverent.aaaaxy.yml
index fa7b04f69f..4136d34e7c 100644
--- a/metadata/io.github.divverent.aaaaxy.yml
+++ b/metadata/io.github.divverent.aaaaxy.yml
@@ -172,17 +172,13 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y advancecomp openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo go.tar.gz https://go.dev/dl/go1.19.linux-amd64.tar.gz
-      - echo "464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6 go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
+      - apt-get install -y advancecomp
+      - apt-get -t bullseye-backports golang-go
     gradle:
       - yes
-    prebuild: sed -i -e 's,^aaaaxy_build_use_version_file=false$,aaaaxy_build_use_version_file=true,'
-        ../gradle.properties
-    ndk: r25
+    ndk: r25b
+    gradleprops:
+      - aaaaxy_build_use_version_file=true
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/io.homeassistant.companion.android.minimal.yml b/metadata/io.homeassistant.companion.android.minimal.yml
index 7a5cba914c..b0d14a7b87 100644
--- a/metadata/io.homeassistant.companion.android.minimal.yml
+++ b/metadata/io.homeassistant.companion.android.minimal.yml
@@ -303,10 +303,6 @@ Builds:
     versionCode: 2770
     commit: 2022.10.2
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - minimal
     rm:
diff --git a/metadata/it.vfsfitvnm.vimusic.yml b/metadata/it.vfsfitvnm.vimusic.yml
index b1b4c9722d..8adb5f0e3a 100644
--- a/metadata/it.vfsfitvnm.vimusic.yml
+++ b/metadata/it.vfsfitvnm.vimusic.yml
@@ -140,9 +140,6 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild:
-      - sed -i -e 's/7.5-rc-2/7.4/' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i -e 's/7.4.0-alpha08/7.2.0/' ../build.gradle.kts
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/juloo.keyboard2.yml b/metadata/juloo.keyboard2.yml
index 6303cd2963..9e4d495415 100644
--- a/metadata/juloo.keyboard2.yml
+++ b/metadata/juloo.keyboard2.yml
@@ -257,11 +257,9 @@ Builds:
     commit: 167c63ee25512da45b76f1e0c43a14527f3144d4
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y make
     output: unsigned.apk
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' > /dev/null
+    prebuild: sdkmanager 'platforms;android-30'
     build:
       - make _build/juloo.keyboard2.unsigned-apk
       - mv _build/juloo.keyboard2.unsigned-apk unsigned.apk
diff --git a/metadata/me.blog.korn123.easydiary.yml b/metadata/me.blog.korn123.easydiary.yml
index 5745c158b3..270eecabbb 100644
--- a/metadata/me.blog.korn123.easydiary.yml
+++ b/metadata/me.blog.korn123.easydiary.yml
@@ -747,14 +747,10 @@ Builds:
     versionCode: 281
     commit: e459c358f0881aa2b8c1b214cd4b0e966708c9c3
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - foss
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 1.4.281.202210180
 CurrentVersionCode: 281
diff --git a/metadata/net.mullvad.mullvadvpn.yml b/metadata/net.mullvad.mullvadvpn.yml
index e44e863d59..d62a326e06 100644
--- a/metadata/net.mullvad.mullvadvpn.yml
+++ b/metadata/net.mullvad.mullvadvpn.yml
@@ -145,15 +145,18 @@ Builds:
   - versionName: '2022.2'
     versionCode: 22020099
     commit: fe8f0396408c72215ae8ffa3dc632ee2846ce94f
-    init: NDK_PATH="$$NDK$$" android/fdroid-build/init.sh
-    output: android/app/build/outputs/apk/fdroid/app-fdroid-unsigned.apk
+    subdir: android/app
+    init: NDK_PATH="$$NDK$$" ../fdroid-build/init.sh
     rm:
       - gui
       - graphics
+      - ios
       - windows
+    prebuild: sed -i -e 's|Repositories.GradlePlugins|"https://plugins.gradle.org/m2/"|'
+        ../build.gradle.kts
     build:
-      - NDK_PATH="$$NDK$$" source android/fdroid-build/env.sh
-      - ./build-apk.sh --fdroid
+      - NDK_PATH="$$NDK$$" source ../fdroid-build/env.sh
+      - ../../build-apk.sh --fdroid
     ndk: r20b
 
 AutoUpdateMode: Version android/%v
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 985f55079e..62a5923114 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1932,6 +1932,7 @@ Builds:
     versionCode: 300020
     commit: bea564250e8d2938bf1451f782ae6994b2de418f
     subdir: aTalk
+    sudo: chmod 777 /opt/android-sdk/
     gradle:
       - fdroid
     rm:
diff --git a/metadata/org.openhab.habdroid.yml b/metadata/org.openhab.habdroid.yml
index fd04a64134..26f37aceca 100644
--- a/metadata/org.openhab.habdroid.yml
+++ b/metadata/org.openhab.habdroid.yml
@@ -308,10 +308,10 @@ Builds:
     gradle:
       - foss
       - stable
-    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
+    prebuild:
+      - sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
         -e '/google-services/d' build.gradle
-    gradleprops:
-      - org.gradle.jvmargs=-Xmx4096m
+      - echo 'org.gradle.jvmargs=-Xmx4g' >> ../gradle.properties
 
 MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
     it to not trigger fdroid/fdroidserver#463.
diff --git a/metadata/org.sensors2.osc.yml b/metadata/org.sensors2.osc.yml
index b2accb263c..e6aff4ec8a 100644
--- a/metadata/org.sensors2.osc.yml
+++ b/metadata/org.sensors2.osc.yml
@@ -99,10 +99,6 @@ Builds:
     versionCode: 9
     commit: e0783d8cadeeac049c09588fa88bd551ed426ad7
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/us.spotco.extirpater.yml b/metadata/us.spotco.extirpater.yml
index a1dd481f22..d7859fcde2 100644
--- a/metadata/us.spotco.extirpater.yml
+++ b/metadata/us.spotco.extirpater.yml
@@ -58,14 +58,10 @@ Builds:
     versionCode: 27
     commit: 4dad6605d1227c16735cc71716f002c59af87376
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v-%c
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '1.4'
 CurrentVersionCode: 27
diff --git a/metadata/us.spotco.malwarescanner.yml b/metadata/us.spotco.malwarescanner.yml
index 9dc1f9565a..42131eb8f3 100644
--- a/metadata/us.spotco.malwarescanner.yml
+++ b/metadata/us.spotco.malwarescanner.yml
@@ -114,14 +114,10 @@ Builds:
     versionCode: 87
     commit: 6149166f6b781420bfea281f56ec66c9ff17a419
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v-%c
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '2.26'
 CurrentVersionCode: 87
diff --git a/metadata/us.spotco.maps.yml b/metadata/us.spotco.maps.yml
index 73029a6754..c660eb2539 100644
--- a/metadata/us.spotco.maps.yml
+++ b/metadata/us.spotco.maps.yml
@@ -81,14 +81,10 @@ Builds:
     versionCode: 24
     commit: 869854a55323821f46f0276cc75f4df6fbfdbe50
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v-%c
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '1.5'
 CurrentVersionCode: 24
diff --git a/metadata/us.spotco.motionlock.yml b/metadata/us.spotco.motionlock.yml
index e3f4894b4c..da2cbba255 100644
--- a/metadata/us.spotco.motionlock.yml
+++ b/metadata/us.spotco.motionlock.yml
@@ -44,14 +44,10 @@ Builds:
     versionCode: 17
     commit: 3ebe90c193a7edefe12e71313391d6fba0feaa96
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v-%c
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '1.1'
 CurrentVersionCode: 17