diff --git a/metadata/im.pattle.app.yml b/metadata/im.pattle.app.yml
index e3cd77f5d1..9f234f5718 100644
--- a/metadata/im.pattle.app.yml
+++ b/metadata/im.pattle.app.yml
@@ -104,14 +104,15 @@ Builds:
     commit: v0.15.0
     output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
     srclibs:
-      - flutter@v1.12.13+hotfix.8
+      - flutter@beta
     prebuild:
       - echo 'BUILD_TYPE=fdroid' > .env
       - echo 'SENTRY_DSN=https://4e306dcaabef4fd99a3e6a024a9747bb@sentry.pattle.im/9'
         >> .env
       - 'echo "version: $$VERSION$$+$$VERCODE$$" >> pubspec.yaml'
-      - sed -i -e '/google-services/g' android/build.gradle android/app/build.gradle
-      - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
+      - sed -i -e '/google-services/g' -e '/firebase/g' -e '/signingConfigs/,+8d'
+        -e '/signingConfig/d' android/app/build.gradle android/build.gradle
+      - sed -i -e '/FlutterFirebaseMessagingService/g' android/app/src/main/kotlin/im/pattle/pattle/App.kt
     build: $$flutter$$/bin/flutter build apk --flavor fdroid -v --suppress-analytics
 
 AutoUpdateMode: Version v%v