diff --git a/metadata/com.blockbasti.justanotherworkouttimer.yml b/metadata/com.blockbasti.justanotherworkouttimer.yml
index de5d418e21..b93b0dbdf8 100644
--- a/metadata/com.blockbasti.justanotherworkouttimer.yml
+++ b/metadata/com.blockbasti.justanotherworkouttimer.yml
@@ -36,9 +36,13 @@ Builds:
   - versionName: 1.12.0
     versionCode: 20230722
     commit: 750a121a3971a154eacaae46d6605713f6fb8feb
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.10.0
+      - flutter@3.10.6
     rm:
       - android/app/proguard-rules.pro
     prebuild: sed -i -e '/proguardFiles/d' android/app/build.gradle
diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml
index 1dd4903628..afb94405a5 100644
--- a/metadata/com.foxdebug.acode.yml
+++ b/metadata/com.foxdebug.acode.yml
@@ -473,6 +473,41 @@ Builds:
       - node_modules/jszip/.jekyll-metadata
     build: cordova compile android --release -- --packageType=apk
 
+  - versionName: 1.8.5
+    versionCode: 304
+    commit: 8a9f6d5cfd517c72f37bbbf6af65878f57dad929
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - chmod -R 777 /opt/android-sdk
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v18.16.1/node-v18.16.1-linux-x64.tar.gz
+      - echo "59582f51570d0857de6333620323bdeee5ae36107318f86ce5eca24747cabf5b node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm install -g npm@latest
+      - npm install -g cordova yarn
+    output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
+    rm:
+      - src/pages/donate
+      - src/plugins/iap
+    prebuild:
+      - sed -i -e '/iap/d' package.json
+      - sed -i -e '/iap.startConnection/,/Purchase error/c} catch (e) {' src/lib/main.js
+      - sed -i -e '/Donate/d' src/settings/mainSettings.js
+      - sed -i -e 's/acodefree/acode/' utils/config.js
+      - sed -i -e 's/build/prepare/' utils/scripts/build.sh
+      - sed -i -e '/core-google-shortcuts/d' src/plugins/system/plugin.xml
+      - yarn setup
+      - cordova plugin add cordova-plugin-file
+      - cordova platform add android
+      - rm node_modules/cordova-android/framework/cordova-publish.gradle
+      - yarn build android free p
+      - sdkmanager 'build-tools;31.0.0' 'build-tools;30.0.3'
+      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
+      - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
+    scandelete:
+      - node_modules/jszip/.jekyll-metadata
+    build: cordova compile android --release -- --packageType=apk
+
 AutoUpdateMode: None
 UpdateCheckMode: HTTP
 UpdateCheckData: https://raw.githubusercontent.com/deadlyjack/Acode/main/config.xml|android-versionCode="(\d+)"|.|version="([\d.]+)"
diff --git a/metadata/com.tuntori.mightieramp.yml b/metadata/com.tuntori.mightieramp.yml
index aa26d9a770..ba28331bdc 100644
--- a/metadata/com.tuntori.mightieramp.yml
+++ b/metadata/com.tuntori.mightieramp.yml
@@ -142,42 +142,13 @@ Builds:
       - $$flutter$$/bin/flutter build apk --release
     ndk: r21
 
-  - versionName: 1.0.5
-    versionCode: 48
-    disable: patch fails
-    commit: a8b06b050adaabd68f63f6f0b3f7df0f00601a9f
-    patch:
-      - remove_youtube_sentry_support_29.diff
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@3.7.7
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sed -i -e '/INTERNET/d' -e '/ACCESS_NETWORK_STATE/d' android/app/src/main/AndroidManifest.xml
-      - sed -i -e '/^  sentry:/,/^    version:/d' -e '/^  sentry_flutter:/,/^    version:/d'
-        pubspec.lock
-      - sed -i -e '/sentry_flutter/d' pubspec.yaml
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - $$flutter$$/bin/flutter config --no-analytics
-    scandelete:
-      - .pub-cache
-    build:
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - $$flutter$$/bin/flutter build apk --release
-    ndk: r21
-
   - versionName: 1.0.6
     versionCode: 49
+    disable: https://github.com/tuntorius/mightier_amp/issues/67
     commit: f7d282553063f4ae30213c301b030bd51aa26103
-    patch:
-      - remove_youtube_sentry_support_29.diff
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@3.7.7
+      - flutter@3.10.6
     rm:
       - ios
       - linux
@@ -186,8 +157,12 @@ Builds:
     prebuild:
       - sed -i -e '/INTERNET/d' -e '/ACCESS_NETWORK_STATE/d' android/app/src/main/AndroidManifest.xml
       - sed -i -e '/^  sentry:/,/^    version:/d' -e '/^  sentry_flutter:/,/^    version:/d'
-        pubspec.lock
-      - sed -i -e '/sentry_flutter/d' pubspec.yaml
+        -e '/^  youtube_explode_dart:/,/^    version:/d' pubspec.lock
+      - sed -i -e '/sentry_flutter/d' -e '/youtube_explode_dart/d' pubspec.yaml
+      - sed -i -e '/startsWith("yt:")/,/^    }/s/^      .*//g' -e '/YoutubeSource/d'
+        lib/audio/online_sources/sourceResolver.dart
+      - sed -i -e '/void addFromYoutubeSource/,/^  }/d' -e '/addFromYoutubeSource/d'
+        -e '/YoutubeSource/d' lib/audio/tracksPage.dart
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
     scandelete: