diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml
index 81c70d20b5..4756b67845 100644
--- a/metadata/com.b44t.messenger.yml
+++ b/metadata/com.b44t.messenger.yml
@@ -3376,6 +3376,8 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y make g++ cmake
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fat
     srclibs:
@@ -3398,6 +3400,7 @@ Builds:
     build:
       - pushd $$maplibre-gl-native$$/platform/android
       - git submodule update --init --recursive
+      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
       - BUILDTYPE=Release make android-lib-arm-v7
       - gradle -Pmapbox.abis=armeabi-v7a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:publishToMavenLocal
       - popd
@@ -3417,6 +3420,8 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y make g++ cmake
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fat
     srclibs:
@@ -3438,6 +3443,7 @@ Builds:
     build:
       - pushd $$maplibre-gl-native$$/platform/android
       - git submodule update --init --recursive
+      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
       - BUILDTYPE=Release make android-lib-arm-v8
       - gradle -Pmapbox.abis=arm64-v8a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
         :MapboxGLAndroidSDK:publishToMavenLocal
@@ -3458,6 +3464,8 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y make g++ cmake
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fat
     srclibs:
@@ -3479,6 +3487,7 @@ Builds:
     build:
       - pushd $$maplibre-gl-native$$/platform/android
       - git submodule update --init --recursive
+      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
       - BUILDTYPE=Release make android-lib-x86
       - gradle -Pmapbox.abis=x86 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
         :MapboxGLAndroidSDK:publishToMavenLocal
@@ -3499,6 +3508,8 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y make g++ cmake
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fat
     srclibs:
@@ -3520,6 +3531,7 @@ Builds:
     build:
       - pushd $$maplibre-gl-native$$/platform/android
       - git submodule update --init --recursive
+      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
       - BUILDTYPE=Release make android-lib-x86-64
       - gradle -Pmapbox.abis=x86_64 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
         :MapboxGLAndroidSDK:publishToMavenLocal
diff --git a/metadata/com.razeeman.util.simpletimetracker.yml b/metadata/com.razeeman.util.simpletimetracker.yml
index b2596d3643..75e03cd9f3 100644
--- a/metadata/com.razeeman.util.simpletimetracker.yml
+++ b/metadata/com.razeeman.util.simpletimetracker.yml
@@ -223,9 +223,13 @@ Builds:
       - apt-get install -y openjdk-17-jdk-headless
       - update-java-alternatives -a
     gradle:
-      - yes
-    prebuild: sed -e 's/\s\+"/implementation "/g' ../buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt
-      > deps.gradle
+      - base
+    binary: https://github.com/Razeeman/Android-SimpleTimeTracker/releases/download/v%v/%v-stt-app-base-release.apk
+    prebuild:
+      - sed -i -e '/services/d' ../features/feature_wear/build.gradle.kts ../wear/build.gradle.kts
+        ../buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt
+      - sed -e 's/\s\+"/implementation "/g' ../buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt
+        > deps.gradle
 
 AllowedAPKSigningKeys: 9f2241eaf78be6b8415f2db424ef99c9745576fe07b0e58b08c922289a3633e4
 
diff --git a/metadata/io.github.benderblog.traintime_pda.yml b/metadata/io.github.benderblog.traintime_pda.yml
index 33f9ba6f91..771eb5d6bd 100644
--- a/metadata/io.github.benderblog.traintime_pda.yml
+++ b/metadata/io.github.benderblog.traintime_pda.yml
@@ -449,8 +449,6 @@ Builds:
       - chown vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     binary: https://github.com/BenderBlog/traintime_pda/releases/download/v%v/app-x86_64-release.apk
-    srclibs:
-      - transistor-background-fetch@f4ba942dbe4e8e62b47067508bb76f2eb3172bb3
     rm:
       - .github
       - .vscode
@@ -466,7 +464,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - sed -i -e '/maven {/,/^        }/cmavenLocal()' android/build.gradle .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
       - popd
       - mv $repo/traintime_pda io.github.benderblog.traintime_pda
     scanignore:
@@ -479,10 +476,6 @@ Builds:
       - cd ..
       - mv io.github.benderblog.traintime_pda $repo/traintime_pda
       - pushd $repo/traintime_pda
-      - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/
-      - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease
-      - gradle publishToMavenLocal
-      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
       - popd
@@ -499,8 +492,6 @@ Builds:
       - chown vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     binary: https://github.com/BenderBlog/traintime_pda/releases/download/v%v/app-armeabi-v7a-release.apk
-    srclibs:
-      - transistor-background-fetch@f4ba942dbe4e8e62b47067508bb76f2eb3172bb3
     rm:
       - .github
       - .vscode
@@ -516,7 +507,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - sed -i -e '/maven {/,/^        }/cmavenLocal()' android/build.gradle .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
       - popd
       - mv $repo/traintime_pda io.github.benderblog.traintime_pda
     scanignore:
@@ -529,10 +519,6 @@ Builds:
       - cd ..
       - mv io.github.benderblog.traintime_pda $repo/traintime_pda
       - pushd $repo/traintime_pda
-      - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/
-      - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease
-      - gradle publishToMavenLocal
-      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
       - popd
@@ -549,8 +535,6 @@ Builds:
       - chown vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     binary: https://github.com/BenderBlog/traintime_pda/releases/download/v%v/app-arm64-v8a-release.apk
-    srclibs:
-      - transistor-background-fetch@f4ba942dbe4e8e62b47067508bb76f2eb3172bb3
     rm:
       - .github
       - .vscode
@@ -566,7 +550,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - sed -i -e '/maven {/,/^        }/cmavenLocal()' android/build.gradle .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle
       - popd
       - mv $repo/traintime_pda io.github.benderblog.traintime_pda
     scanignore:
@@ -579,10 +562,6 @@ Builds:
       - cd ..
       - mv io.github.benderblog.traintime_pda $repo/traintime_pda
       - pushd $repo/traintime_pda
-      - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/
-      - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease
-      - gradle publishToMavenLocal
-      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
       - popd