diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml
index ea9cf3300f..222998493a 100644
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@@ -14058,21 +14058,6 @@ Builds:
     scandelete:
       - app/src/androidTest/assets
 
-  - versionName: '20240725'
-    versionCode: 20240725
-    commit: 2b5c20f35c717a20b6b026fd1804e71fe51c7355
-    subdir: app
-    gradle:
-      - versionDev
-    rm:
-      - user_manual
-    prebuild:
-      - mkdir -p $HOME/.gradle
-      - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
-        > $HOME/.gradle/gradle.properties
-    scandelete:
-      - app/src/androidTest/assets
-
   - versionName: '20240726'
     versionCode: 20240726
     commit: c69e8a922774faa891134ec327321b3c3cb1d6f0
diff --git a/metadata/com.presley.fit_book.yml b/metadata/com.presley.fit_book.yml
index 8fbec2df13..2a697eaaa8 100644
--- a/metadata/com.presley.fit_book.yml
+++ b/metadata/com.presley.fit_book.yml
@@ -2314,137 +2314,9 @@ Builds:
       - mv /home/brandon/fitbook com.presley.fit_book
     ndk: r21e
 
-  - versionName: 1.0.77
-    versionCode: 821
-    disable: https://github.com/brandonp2412/FitBook/issues/26
-    commit: b91a756d872f803cc30e94ab1b7b9266db2b1355
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
-    binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-x86_64-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    scanignore:
-      - assets/my-food-data.zip
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --split-per-abi --target-platform="android-x64"
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    ndk: r21e
-
-  - versionName: 1.0.77
-    versionCode: 822
-    disable: https://github.com/brandonp2412/FitBook/issues/26
-    commit: b91a756d872f803cc30e94ab1b7b9266db2b1355
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-    binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-armeabi-v7a-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    scanignore:
-      - assets/my-food-data.zip
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --split-per-abi --target-platform="android-arm"
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    ndk: r21e
-
-  - versionName: 1.0.77
-    versionCode: 823
-    disable: https://github.com/brandonp2412/FitBook/issues/26
-    commit: b91a756d872f803cc30e94ab1b7b9266db2b1355
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-    binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-arm64-v8a-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    scanignore:
-      - assets/my-food-data.zip
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.fit_book /home/brandon/fitbook
-      - pushd /home/brandon/fitbook
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
-      - popd
-      - mv /home/brandon/fitbook com.presley.fit_book
-    ndk: r21e
-
   - versionName: 1.0.78
     versionCode: 831
+    disable: https://github.com/brandonp2412/FitBook/issues/26
     commit: 34cbf42e7f8582dd5802eba1238b7dbf6a0cd241
     submodules: true
     sudo:
@@ -2487,6 +2359,7 @@ Builds:
 
   - versionName: 1.0.78
     versionCode: 832
+    disable: https://github.com/brandonp2412/FitBook/issues/26
     commit: 34cbf42e7f8582dd5802eba1238b7dbf6a0cd241
     submodules: true
     sudo:
@@ -2529,6 +2402,7 @@ Builds:
 
   - versionName: 1.0.78
     versionCode: 833
+    disable: https://github.com/brandonp2412/FitBook/issues/26
     commit: 34cbf42e7f8582dd5802eba1238b7dbf6a0cd241
     submodules: true
     sudo:
diff --git a/metadata/com.presley.flexify.yml b/metadata/com.presley.flexify.yml
index 45d9292367..b74c9b51a9 100644
--- a/metadata/com.presley.flexify.yml
+++ b/metadata/com.presley.flexify.yml
@@ -4399,134 +4399,9 @@ Builds:
       - mv /home/brandon/flexify com.presley.flexify
     ndk: r21e
 
-  - versionName: 1.1.71
-    versionCode: 1801
-    disable: https://github.com/brandonp2412/Flexify/issues/16
-    commit: b509e7985ebbb2536cb5f8106f0621f611b2b178
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
-    binary: https://github.com/brandonp2412/Flexify/releases/download/%v/app-x86_64-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    scanignore:
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --split-per-abi --target-platform="android-x64"
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    ndk: r21e
-
-  - versionName: 1.1.71
-    versionCode: 1802
-    disable: https://github.com/brandonp2412/Flexify/issues/16
-    commit: b509e7985ebbb2536cb5f8106f0621f611b2b178
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-    binary: https://github.com/brandonp2412/Flexify/releases/download/%v/app-armeabi-v7a-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    scanignore:
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --split-per-abi --target-platform="android-arm"
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    ndk: r21e
-
-  - versionName: 1.1.71
-    versionCode: 1803
-    disable: https://github.com/brandonp2412/Flexify/issues/16
-    commit: b509e7985ebbb2536cb5f8106f0621f611b2b178
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ninja-build
-      - mkdir -p /home/brandon
-      - chown vagrant -R /home/brandon
-    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-    binary: https://github.com/brandonp2412/Flexify/releases/download/%v/app-arm64-v8a-release.apk
-    rm:
-      - ios
-      - linux
-      - web
-      - windows
-    prebuild:
-      - sdkmanager 'cmake;3.18.1'
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter config --no-analytics
-      - flutter/bin/flutter pub get
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    scanignore:
-      - flutter/bin/cache
-    scandelete:
-      - .pub-cache
-      - flutter
-    build:
-      - cd ..
-      - mv com.presley.flexify /home/brandon/flexify
-      - pushd /home/brandon/flexify
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - flutter/bin/flutter build apk --split-per-abi --target-platform="android-arm64"
-      - popd
-      - mv /home/brandon/flexify com.presley.flexify
-    ndk: r21e
-
   - versionName: 1.1.72
     versionCode: 1811
+    disable: https://github.com/brandonp2412/Flexify/issues/16
     commit: f43ccccf18c1f3202f60c37d46fe5bd56474d05d
     submodules: true
     sudo:
@@ -4568,6 +4443,7 @@ Builds:
 
   - versionName: 1.1.72
     versionCode: 1812
+    disable: https://github.com/brandonp2412/Flexify/issues/16
     commit: f43ccccf18c1f3202f60c37d46fe5bd56474d05d
     submodules: true
     sudo:
@@ -4609,6 +4485,7 @@ Builds:
 
   - versionName: 1.1.72
     versionCode: 1813
+    disable: https://github.com/brandonp2412/Flexify/issues/16
     commit: f43ccccf18c1f3202f60c37d46fe5bd56474d05d
     submodules: true
     sudo: