diff --git a/metadata/com.yubico.yubioath.yml b/metadata/com.yubico.yubioath.yml
index 068a6ef72c..6a962e05d7 100644
--- a/metadata/com.yubico.yubioath.yml
+++ b/metadata/com.yubico.yubioath.yml
@@ -596,70 +596,85 @@ Builds:
 
   - versionName: 7.0.0
     versionCode: 700001
-    disable: https://github.com/Yubico/yubioath-flutter/issues/1552
     commit: 3c59e7cedaede3b670c0df139ff3896fd73d6429
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     srclibs:
-      - flutter@3.16.4
+      - flutter@stable
     rm:
       - linux
       - macos
       - test
       - windows
     prebuild:
-      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - source .github/workflows/env
+      - pushd $$flutter$$
+      - git checkout -f $FLUTTER
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
     scandelete:
       - .pub-cache
     build:
+      - pushd android/app
+      - gradle collectLicenses
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
 
   - versionName: 7.0.0
     versionCode: 700002
-    disable: https://github.com/Yubico/yubioath-flutter/issues/1552
     commit: 3c59e7cedaede3b670c0df139ff3896fd73d6429
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     srclibs:
-      - flutter@3.16.4
+      - flutter@stable
     rm:
       - linux
       - macos
       - test
       - windows
     prebuild:
-      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - source .github/workflows/env
+      - pushd $$flutter$$
+      - git checkout -f $FLUTTER
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
     scandelete:
       - .pub-cache
     build:
+      - pushd android/app
+      - gradle collectLicenses
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
 
   - versionName: 7.0.0
     versionCode: 700004
-    disable: https://github.com/Yubico/yubioath-flutter/issues/1552
     commit: 3c59e7cedaede3b670c0df139ff3896fd73d6429
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     srclibs:
-      - flutter@3.16.4
+      - flutter@stable
     rm:
       - linux
       - macos
       - test
       - windows
     prebuild:
-      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - source .github/workflows/env
+      - pushd $$flutter$$
+      - git checkout -f $FLUTTER
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
     scandelete:
       - .pub-cache
     build:
+      - pushd android/app
+      - gradle collectLicenses
+      - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"