diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
index 7f6904b6f08..eff9d075198 100644
--- a/app-k9mail/build.gradle.kts
+++ b/app-k9mail/build.gradle.kts
@@ -46,8 +46,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 39004
-        versionName = "6.905-SNAPSHOT"
+        versionCode = 39005
+        versionName = "8.0b1"
 
         // Keep in sync with the resource string array "supported_languages"
         resourceConfigurations.addAll(
diff --git a/app-k9mail/src/main/res/raw/changelog_master.xml b/app-k9mail/src/main/res/raw/changelog_master.xml
index 9ccedd1d68d..670ca725787 100644
--- a/app-k9mail/src/main/res/raw/changelog_master.xml
+++ b/app-k9mail/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,14 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="8.0b1" versioncode="39005" date="2024-09-30">
+        <change>Updated subject encryption</change>
+        <change>Removed outdated folder settings</change>
+        <change>Improved maintainability</change>
+        <change>Added domain validation for email input</change>
+        <change>Fixed TalkBack and crypto dialog crashes</change>
+        <change>Updated Material 3 colors</change>
+    </release>
     <release version="6.904" versioncode="39004" date="2024-06-27">
         <change>Fixed crash when split screen mode is enabled</change>
         <change>Updated translations</change>
diff --git a/app-metadata/com.fsck.k9/en-US/changelogs/39005.txt b/app-metadata/com.fsck.k9/en-US/changelogs/39005.txt
new file mode 100644
index 00000000000..2d2f4ac59ee
--- /dev/null
+++ b/app-metadata/com.fsck.k9/en-US/changelogs/39005.txt
@@ -0,0 +1,6 @@
+- Updated subject encryption
+- Removed outdated folder settings
+- Improved maintainability
+- Added domain validation for email input
+- Fixed TalkBack and crypto dialog crashes
+- Updated Material 3 colors
diff --git a/metadata b/metadata
index c94b88fb8fa..cd46587ebb6 120000
--- a/metadata
+++ b/metadata
@@ -1 +1 @@
-app-metadata/net.thunderbird.android.beta
\ No newline at end of file
+app-metadata/com.fsck.k9
\ No newline at end of file