diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index a185d30825..0a60dc0d68 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -1654,6 +1654,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '12.0'
+    versionCode: 39027
+    commit: 9543b525467d523887b3e2b6df041dd11db51d84
+    subdir: app-k9mail
+    gradle:
+      - foss
+    rm:
+      - app-thunderbird
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e 's|maven.mozilla.org/maven2|jitpack.io|' -e '/glean/d' -e '/googleplay/d'
+        -e '/foojay/d' ../settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' build.gradle.kts
+    scandelete:
+      - build-plugin
+
 MaintainerNotes: |-
   Use output instead of subdir to make gradlew-fdroid correctly determine the gradle version to be used.
   It doesn't work when using subdir because we are two levels deep into the directory structure.
@@ -1661,5 +1677,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '11.1'
-CurrentVersionCode: 39026
+CurrentVersion: '12.0'
+CurrentVersionCode: 39027
diff --git a/metadata/net.thunderbird.android.yml b/metadata/net.thunderbird.android.yml
index 336d458baa..ea33cc0a05 100644
--- a/metadata/net.thunderbird.android.yml
+++ b/metadata/net.thunderbird.android.yml
@@ -146,6 +146,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '12.0'
+    versionCode: 14
+    commit: ecbd88304318b4e62f7e6c307a9d1fa1d8d6edda
+    subdir: app-thunderbird
+    gradle:
+      - foss
+    rm:
+      - app-k9mail
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e 's|maven.mozilla.org/maven2|jitpack.io|' -e '/glean/d' -e '/googleplay/d'
+        -e '/foojay/d' ../settings.gradle.kts ../settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' build.gradle.kts
+    scandelete:
+      - build-plugin
+
 AllowedAPKSigningKeys: b6524779b3dbbc5ac17a5ac271ddb29dcfbf723578c238e03c3c217811356dd1
 
 MaintainerNotes: |-
@@ -167,5 +183,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '11.1'
-CurrentVersionCode: 13
+CurrentVersion: '12.0'
+CurrentVersionCode: 14