diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ea5fd8dd..e1c3d8811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.12.7
+
+* Remove channel discovery feature from Google Play version
+
 ### Version 2.12.6
 
 * Fix 'q' falsely being recognized as cyrillic
diff --git a/build.gradle b/build.gradle
index 1c0a79985..2157efbf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ configurations {
 dependencies {
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:23.1.2') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:23.2.1') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 42060
-        versionName "2.12.6"
+        versionCode 42061
+        versionName "2.12.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/42061.txt b/fastlane/metadata/android/en-US/changelogs/42061.txt
new file mode 100644
index 000000000..0475d110d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42061.txt
@@ -0,0 +1 @@
+* Remove channel discovery feature from Google Play version