diff --git a/app-k9mail/src/main/res/raw/changelog_master.xml b/app-k9mail/src/main/res/raw/changelog_master.xml
index 6a81624ed2d51f11e27bee67e4e1791e5232089b..5311b495c72400a7bfec45ebc6fb8fc3b26a3b35 100644
--- a/app-k9mail/src/main/res/raw/changelog_master.xml
+++ b/app-k9mail/src/main/res/raw/changelog_master.xml
@@ -5,15 +5,6 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
-    <release version="9.0" versioncode="39021" date="2025-03-03">
-        <change>Basic support for Android 15</change>
-        <change>Add a link to the support article when signing in with Google</change>
-        <change>Account setup attempts email provider's autoconfig first, then falls back to ISPDB</change>
-        <change>Updated translations for multiple languages</change>
-        <change>The changelog now properly displays release versions</change>
-        <change>A wrong translation of the app name has been fixed</change>
-        <change>Dependencies have been updated to fix a couple of bugs</change>
-    </release>
     <release version="8.2" versioncode="39019" date="2024-12-09">
         <change>You can now support K-9 Mail development with financial contributions.</change>
         <change>Account initials now use the display name</change>
diff --git a/app-metadata/com.fsck.k9/en-US/changelogs/39021.txt b/app-metadata/com.fsck.k9/en-US/changelogs/39021.txt
deleted file mode 100644
index 70026a5c680abfb5ba14366e130a49d7f5318c77..0000000000000000000000000000000000000000
--- a/app-metadata/com.fsck.k9/en-US/changelogs/39021.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-- Basic support for Android 15
-- Add a link to the support article when signing in with Google
-- Account setup attempts email provider's autoconfig first, then falls back to ISPDB
-- Updated translations for multiple languages
-- The changelog now properly displays release versions
-- A wrong translation of the app name has been fixed
-- Dependencies have been updated to fix a couple of bugs
\ No newline at end of file
diff --git a/app-metadata/net.thunderbird.android/en-US/changelogs/9.txt b/app-metadata/net.thunderbird.android/en-US/changelogs/9.txt
deleted file mode 100644
index 9542f9f5600beb628252d8af4b2d5daef0048bcd..0000000000000000000000000000000000000000
--- a/app-metadata/net.thunderbird.android/en-US/changelogs/9.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Thunderbird for Android version 9.0, based on K-9 Mail. Changes include:
-- Basic support for Android 15
-- Add a link to the support article when signing in with Google
-- Account setup attempts email provider's autoconfig first, then falls back to ISPDB
-- Updated translations for multiple languages
-- The changelog now properly displays release versions
-- A wrong translation of the app name has been fixed
-- Dependencies have been updated to fix a couple of bugs
\ No newline at end of file
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index 3194da2450b536e41312e33cbf43a04a0ca2902d..e2b40d3c6ec172f7df33daa1bcbdae2c635db58d 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -20,7 +20,7 @@ android {
         applicationId = "net.thunderbird.android"
         testApplicationId = "net.thunderbird.android.tests"
 
-        versionCode = 9
+        versionCode = 8
         versionName = "9.0"
 
         // Keep in sync with the resource string array "supported_languages"
diff --git a/app-thunderbird/src/release/res/raw/changelog_master.xml b/app-thunderbird/src/release/res/raw/changelog_master.xml
index f176ff0d401d17864fab22e71e2a051b5f7edf78..e3d81571df5c937f95f06fed7e07a05225c5bb1f 100644
--- a/app-thunderbird/src/release/res/raw/changelog_master.xml
+++ b/app-thunderbird/src/release/res/raw/changelog_master.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type="text/xsl" href="changelog_style.xsl"?>
 <changelog>
-    <release version="9.0" versioncode="9" date="2025-03-03">
-        <change>Basic support for Android 15</change>
-        <change>Add a link to the support article when signing in with Google</change>
-        <change>Account setup attempts email provider's autoconfig first, then falls back to ISPDB</change>
-        <change>Updated translations for multiple languages</change>
-        <change>The changelog now properly displays release versions</change>
-        <change>A wrong translation of the app name has been fixed</change>
-        <change>Dependencies have been updated to fix a couple of bugs</change>
-    </release>
     <release version="8.2" versioncode="8" date="2024-12-09">
         <change>Account initials now use the display name</change>
         <change>Account icons remain in the same position when selected</change>