diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 456cdd8b81..812bac536d 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -1472,6 +1472,19 @@ Builds:
     scandelete:
       - build-plugin/build
 
+  - versionName: '8.0'
+    versionCode: 39009
+    commit: K9MAIL_8_0
+    subdir: app-k9mail
+    gradle:
+      - yes
+    rm:
+      - feature/funding/googleplay
+    prebuild: sed -i -e '/maven\.mozilla\.org\/maven2/d ; /glean/d ; /app-thunderbird/d
+      ; /googleplay/d' ../settings.gradle.kts
+    scandelete:
+      - build-plugin/build
+
   - versionName: 8.0b5
     versionCode: 39010
     commit: K9MAIL_8_0b5
@@ -1492,5 +1505,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '6.804'
-CurrentVersionCode: 38004
+CurrentVersion: '8.0'
+CurrentVersionCode: 39009