diff --git a/CHANGES.md b/CHANGES.md
index 5a90fd3f01..e3e7f46744 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,17 @@
+Changes in Element v1.6.18 (2024-06-25)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix redacted events not grouped correctly when hidden events are inserted between. ([#8840](https://github.com/element-hq/element-android/issues/8840))
+ - Element-Android session doesn't encrypt for a dehydrated device ([#8842](https://github.com/element-hq/element-android/issues/8842))
+ - Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X. ([#8894](https://github.com/element-hq/element-android/issues/8894))
+
+Other changes
+-------------
+ - Posthog | report platform code for EA ([#8839](https://github.com/element-hq/element-android/issues/8839))
+
+
 Changes in Element v1.6.16 (2024-05-29)
 =======================================
 
diff --git a/changelog.d/8839.misc b/changelog.d/8839.misc
deleted file mode 100644
index 00650ede9a..0000000000
--- a/changelog.d/8839.misc
+++ /dev/null
@@ -1 +0,0 @@
-Posthog | report platform code for EA
diff --git a/changelog.d/8840.bugfix b/changelog.d/8840.bugfix
deleted file mode 100644
index 87175c2443..0000000000
--- a/changelog.d/8840.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix redacted events not grouped correctly when hidden events are inserted between.
diff --git a/changelog.d/8842.bugfix b/changelog.d/8842.bugfix
deleted file mode 100644
index 77c2b3eed7..0000000000
--- a/changelog.d/8842.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Element-Android session doesn't encrypt for a dehydrated device
diff --git a/changelog.d/8894.bugfix b/changelog.d/8894.bugfix
deleted file mode 100644
index 064ebfc507..0000000000
--- a/changelog.d/8894.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Intercept only links from `element.io` well known hosts. The previous behaviour broke OIDC login in Element X.
diff --git a/fastlane/metadata/android/en-US/changelogs/40106180.txt b/fastlane/metadata/android/en-US/changelogs/40106180.txt
new file mode 100644
index 0000000000..bc5a0f731a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40106180.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Bugfixes.
+Full changelog: https://github.com/element-hq/element-android/releases