diff --git a/metadata/im.pattle.app.yml b/metadata/im.pattle.app.yml
index c907bbfd0a..94e4ceb264 100644
--- a/metadata/im.pattle.app.yml
+++ b/metadata/im.pattle.app.yml
@@ -3,11 +3,11 @@ Categories:
   - Phone & SMS
 License: AGPL-3.0-or-later
 AuthorName: Wilko Manger
-AuthorEmail: wilko@rens.onl
+AuthorEmail: wilko@pattle.org
 WebSite: https://pattle.im
-SourceCode: https://git.pattle.im/pattle/app
-IssueTracker: https://git.pattle.im/pattle/app/issues
-Changelog: https://git.pattle.im/pattle/app/releases
+SourceCode: https://pattle.dev/pattle/app
+IssueTracker: https://pattle.dev/pattle/app/issues
+Changelog: https://pattle.dev/pattle/app/releases
 LiberapayID: '1572112'
 
 AutoName: Pattle
@@ -23,7 +23,7 @@ Description: |-
     Also note that notifications are not implemented yet.
 
 RepoType: git
-Repo: https://git.pattle.im/pattle/app.git
+Repo: https://pattle.dev/pattle/app.git
 
 Builds:
   - versionName: 0.10.1
@@ -145,8 +145,28 @@ Builds:
       - 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
 
+  - versionName: 0.18.0
+    versionCode: 810
+    commit: v0.18.0
+    output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
+    srclibs:
+      - flutter@1.17.3
+    prebuild:
+      - echo 'BUILD_TYPE=fdroid' > .env
+      - echo 'SENTRY_DSN=https://41b254e4b27a4ec9a297da3e801bd8c2@sentry.pattle.dev/3'
+        >> .env
+      - 'echo "version: $$VERSION$$+$$VERCODE$$" >> pubspec.yaml'
+      - 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/app/App.kt
+      - sed -i -e "/import 'service\/firebase.dart';/g" lib/src/notifications/bloc.dart
+      - sed -i -e 's/FirebaseService()/DummyService()/g' lib/src/notifications/bloc.dart
+      - sed -i -e '/firebase_/g' pubspec.yaml
+      - rm lib/src/notifications/service/firebase.dart
+    build: $$flutter$$/bin/flutter build apk --flavor fdroid -v --suppress-analytics
+
 AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP
 UpdateCheckData: https://version.pattle.im/|\ ([0-9]+)|.|([0-9]+\.[0-9]+\.[0-9]+)
-CurrentVersion: 0.17.0
-CurrentVersionCode: 791
+CurrentVersion: 0.18.0
+CurrentVersionCode: 810