diff --git a/metadata/app.alextran.immich.yml b/metadata/app.alextran.immich.yml
index 115247759f..ac2e7e2007 100644
--- a/metadata/app.alextran.immich.yml
+++ b/metadata/app.alextran.immich.yml
@@ -2678,8 +2678,9 @@ Builds:
       - server
       - web
     prebuild:
-      - export flutterVersion=$(sed -n -E 's/.*flutter-version:\s"([0-9.]+)"/\1/p'
+      - export flutterVersion=$(sed -n -E "s/.*flutter-version:\s'([0-9.]+)'/\1/p"
         ../.github/workflows/build-mobile.yml)
+      - '[[ $flutterVersion ]] || exit 1'
       - pushd $$flutter$$
       - git checkout -f $flutterVersion
       - popd
diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml
index f17cb771f2..156e4842e0 100644
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@@ -13622,21 +13622,6 @@ Builds:
     scandelete:
       - app/src/androidTest/assets
 
-  - versionName: '20240502'
-    versionCode: 20240502
-    commit: 9950b694c07898070cd4bd68caab50a1fd41b567
-    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: '20240503'
     versionCode: 20240503
     commit: f6cae9f62471d77e2f58f99717f9ababcebe6d91
diff --git a/metadata/com.presley.flexify.yml b/metadata/com.presley.flexify.yml
index 71bc41cdd7..ec21d6f197 100644
--- a/metadata/com.presley.flexify.yml
+++ b/metadata/com.presley.flexify.yml
@@ -751,129 +751,6 @@ Builds:
       - mv /home/brandon/flexify com.presley.flexify
     ndk: r21e
 
-  - versionName: 1.0.71
-    versionCode: 781
-    commit: 47ecf633982e1df4da3856eb886f9a2fd8f05261
-    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.0.71
-    versionCode: 782
-    commit: 47ecf633982e1df4da3856eb886f9a2fd8f05261
-    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.0.71
-    versionCode: 783
-    commit: 47ecf633982e1df4da3856eb886f9a2fd8f05261
-    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.0.72
     versionCode: 791
     commit: 225486d8175baa394a2f3cd751c4b4845ee9c6b8