diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 0a60dc0d68..176065a952 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -1670,6 +1670,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '12.1'
+    versionCode: 39028
+    commit: 09a5a2e340ddddb804eda269f26d24383d4b08f0
+    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.
@@ -1677,5 +1693,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '12.0'
-CurrentVersionCode: 39027
+CurrentVersion: '12.1'
+CurrentVersionCode: 39028
diff --git a/metadata/net.thunderbird.android.yml b/metadata/net.thunderbird.android.yml
index ea33cc0a05..b565c432e2 100644
--- a/metadata/net.thunderbird.android.yml
+++ b/metadata/net.thunderbird.android.yml
@@ -162,6 +162,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '12.1'
+    versionCode: 15
+    commit: 875e119249279a75e08e036d5d89bab4150fb286
+    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: |-
@@ -183,5 +199,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '12.0'
-CurrentVersionCode: 14
+CurrentVersion: '12.1'
+CurrentVersionCode: 15