diff --git a/CHANGES.md b/CHANGES.md
index d3b2257815..494b241823 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,54 @@
+Changes in Element X v0.4.0 (2023-12-22)
+========================================
+
+Features ✨
+----------
+ - Use the RTE library `TextView` to render text events in the timeline. Add support for mention pills - with no interaction yet. ([#1433](https://github.com/element-hq/element-x-android/issues/1433))
+ - Tapping on a user mention pill opens their profile. ([#1448](https://github.com/element-hq/element-x-android/issues/1448))
+ - Display different notifications for mentions. ([#1451](https://github.com/element-hq/element-x-android/issues/1451))
+ - Reply to a poll ([#1848](https://github.com/element-hq/element-x-android/issues/1848))
+ - Add plain text representation of messages ([#1850](https://github.com/element-hq/element-x-android/issues/1850))
+ - Allow polls to be edited when they have not been voted on ([#1869](https://github.com/element-hq/element-x-android/issues/1869))
+ - Scroll to end of timeline when sending a new message. ([#1877](https://github.com/element-hq/element-x-android/issues/1877))
+ - Confirm back navigation when editing a poll only if the poll was changed ([#1886](https://github.com/element-hq/element-x-android/issues/1886))
+ - Add option to delete a poll while editing the poll ([#1895](https://github.com/element-hq/element-x-android/issues/1895))
+ - Open room member avatar when you click on it inside the member details screen. ([#1907](https://github.com/element-hq/element-x-android/issues/1907))
+ - Poll history of a room is now accessible from the room details screen. ([#2014](https://github.com/element-hq/element-x-android/issues/2014))
+ - Always close the invite list screen when there is no more invite. ([#2022](https://github.com/element-hq/element-x-android/issues/2022))
+
+Bugfixes 🐛
+----------
+ - Fix see room in the room list after leaving it. ([#1006](https://github.com/element-hq/element-x-android/issues/1006))
+ - Adjust mention pills font weight and horizontal padding ([#1449](https://github.com/element-hq/element-x-android/issues/1449))
+ - Font size in 'All Chats' header was changing mid-animation. ([#1572](https://github.com/element-hq/element-x-android/issues/1572))
+ - Accessibility: do not read initial used for avatar out loud. ([#1864](https://github.com/element-hq/element-x-android/issues/1864))
+ - Use the right avatar for DMs in DM rooms ([#1912](https://github.com/element-hq/element-x-android/issues/1912))
+ - Fix scaling of timeline images: don't crop, don't set min/max aspect ratio values. ([#1940](https://github.com/element-hq/element-x-android/issues/1940))
+ - Fix rendering of user name with vertical text by clipping the text. ([#1950](https://github.com/element-hq/element-x-android/issues/1950))
+ - Do not render `roomId` if the room has no canonical alias. ([#1970](https://github.com/element-hq/element-x-android/issues/1970))
+ - Fix avatar not displayed in notification when the app is not in background ([#1991](https://github.com/element-hq/element-x-android/issues/1991))
+ - Fix wording in room invite members view: `Send` -> `Invite`. ([#2037](https://github.com/element-hq/element-x-android/issues/2037))
+ - Timestamp positioning was broken, specially for edited messages. ([#2060](https://github.com/element-hq/element-x-android/issues/2060))
+ - Emojis in custom reaction bottom sheet are too tiny. ([#2066](https://github.com/element-hq/element-x-android/issues/2066))
+ - Set a default power level to join calls. Also, create new rooms taking this power level into account.
+
+Other changes
+-------------
+ - Add a warning for 'mentions and keywords only' notification option if your homeserver does not support it ([#1749](https://github.com/element-hq/element-x-android/issues/1749))
+ - Remove `:libraries:theme` module, extract theme and tokens to [Compound Android](https://github.com/element-hq/compound-android). ([#1833](https://github.com/element-hq/element-x-android/issues/1833))
+ - Update poll icons from Compound ([#1849](https://github.com/element-hq/element-x-android/issues/1849))
+ - Add ability to see the room avatar in the media viewer. ([#1918](https://github.com/element-hq/element-x-android/issues/1918))
+ - RoomList: introduce incremental loading to improve performances. ([#1920](https://github.com/element-hq/element-x-android/issues/1920))
+ - Add toggle in the notification settings to disable notifications for room invites. ([#1944](https://github.com/element-hq/element-x-android/issues/1944))
+ - Update rendering of Emojis displayed during verification. ([#1965](https://github.com/element-hq/element-x-android/issues/1965))
+ - Hide sender info in direct rooms ([#1979](https://github.com/element-hq/element-x-android/issues/1979))
+ - Render images in Notification ([#1991](https://github.com/element-hq/element-x-android/issues/1991))
+ - Only process content.json from Localazy. ([#2031](https://github.com/element-hq/element-x-android/issues/2031))
+ - Always show user avatar in message action sheet ([#2032](https://github.com/element-hq/element-x-android/issues/2032))
+ - Hide room list dropdown menu. ([#2062](https://github.com/element-hq/element-x-android/issues/2062))
+ - Enable Chat backup, Mentions and Read Receipt in release. ([#2087](https://github.com/element-hq/element-x-android/issues/2087))
+ - Make most code used in Compose from `:libraries:matrix` and derived classes Immutable or Stable.
+
 Changes in Element X v0.3.2 (2023-11-22)
 ========================================
 
diff --git a/changelog.d/+make-matrix-classes-immutable.misc b/changelog.d/+make-matrix-classes-immutable.misc
deleted file mode 100644
index 0dcb7dedb9..0000000000
--- a/changelog.d/+make-matrix-classes-immutable.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make most code used in Compose from `:libraries:matrix` and derived classes Immutable or Stable.
diff --git a/changelog.d/+set-default-power-level-to-join-calls.bugfix b/changelog.d/+set-default-power-level-to-join-calls.bugfix
deleted file mode 100644
index fa143aa850..0000000000
--- a/changelog.d/+set-default-power-level-to-join-calls.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Set a default power level to join calls. Also, create new rooms taking this power level into account.
diff --git a/changelog.d/1006.bugfix b/changelog.d/1006.bugfix
deleted file mode 100644
index 2a3a2bfde0..0000000000
--- a/changelog.d/1006.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix see room in the room list after leaving it.
diff --git a/changelog.d/1433.feature b/changelog.d/1433.feature
deleted file mode 100644
index 54f0403d9c..0000000000
--- a/changelog.d/1433.feature
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the RTE library `TextView` to render text events in the timeline.
-
-Add support for mention pills - with no interaction yet.
diff --git a/changelog.d/1448.feature b/changelog.d/1448.feature
deleted file mode 100644
index 6224008e7a..0000000000
--- a/changelog.d/1448.feature
+++ /dev/null
@@ -1 +0,0 @@
-Tapping on a user mention pill opens their profile.
diff --git a/changelog.d/1449.bugfix b/changelog.d/1449.bugfix
deleted file mode 100644
index adcca27f05..0000000000
--- a/changelog.d/1449.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Adjust mention pills font weight and horizontal padding
diff --git a/changelog.d/1451.feature b/changelog.d/1451.feature
deleted file mode 100644
index 1869f0ecd5..0000000000
--- a/changelog.d/1451.feature
+++ /dev/null
@@ -1 +0,0 @@
-Display different notifications for mentions.
diff --git a/changelog.d/1572.bugfix b/changelog.d/1572.bugfix
deleted file mode 100644
index df27342e34..0000000000
--- a/changelog.d/1572.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Font size in 'All Chats' header was changing mid-animation.
diff --git a/changelog.d/1749.misc b/changelog.d/1749.misc
deleted file mode 100644
index 86c4bd1027..0000000000
--- a/changelog.d/1749.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a warning for 'mentions and keywords only' notification option if your homeserver does not support it
diff --git a/changelog.d/1833.misc b/changelog.d/1833.misc
deleted file mode 100644
index ccb00c2c45..0000000000
--- a/changelog.d/1833.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove `:libraries:theme` module, extract theme and tokens to [Compound Android](https://github.com/element-hq/compound-android).
diff --git a/changelog.d/1848.feature b/changelog.d/1848.feature
deleted file mode 100644
index f2a11f1223..0000000000
--- a/changelog.d/1848.feature
+++ /dev/null
@@ -1 +0,0 @@
-Reply to a poll
diff --git a/changelog.d/1849.misc b/changelog.d/1849.misc
deleted file mode 100644
index 4d34f40ade..0000000000
--- a/changelog.d/1849.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Update poll icons from Compound
-
diff --git a/changelog.d/1850.feature b/changelog.d/1850.feature
deleted file mode 100644
index 275a6e954a..0000000000
--- a/changelog.d/1850.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add plain text representation of messages
diff --git a/changelog.d/1864.bugfix b/changelog.d/1864.bugfix
deleted file mode 100644
index 16f23b661e..0000000000
--- a/changelog.d/1864.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Accessibility: do not read initial used for avatar out loud.
diff --git a/changelog.d/1869.feature b/changelog.d/1869.feature
deleted file mode 100644
index 2c7da08935..0000000000
--- a/changelog.d/1869.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow polls to be edited when they have not been voted on
diff --git a/changelog.d/1877.feature b/changelog.d/1877.feature
deleted file mode 100644
index 1156908c71..0000000000
--- a/changelog.d/1877.feature
+++ /dev/null
@@ -1 +0,0 @@
-Scroll to end of timeline when sending a new message.
diff --git a/changelog.d/1886.feature b/changelog.d/1886.feature
deleted file mode 100644
index ac88b61b8c..0000000000
--- a/changelog.d/1886.feature
+++ /dev/null
@@ -1 +0,0 @@
-Confirm back navigation when editing a poll only if the poll was changed
\ No newline at end of file
diff --git a/changelog.d/1895.feature b/changelog.d/1895.feature
deleted file mode 100644
index a683847fce..0000000000
--- a/changelog.d/1895.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add option to delete a poll while editing the poll
\ No newline at end of file
diff --git a/changelog.d/1907.feature b/changelog.d/1907.feature
deleted file mode 100644
index 9ee2cba969..0000000000
--- a/changelog.d/1907.feature
+++ /dev/null
@@ -1 +0,0 @@
-Open room member avatar when you click on it inside the member details screen.
diff --git a/changelog.d/1912.bugfix b/changelog.d/1912.bugfix
deleted file mode 100644
index 63dbe0b496..0000000000
--- a/changelog.d/1912.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use the right avatar for DMs in DM rooms
diff --git a/changelog.d/1918.misc b/changelog.d/1918.misc
deleted file mode 100644
index d850c133f8..0000000000
--- a/changelog.d/1918.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add ability to see the room avatar in the media viewer.
diff --git a/changelog.d/1920.misc b/changelog.d/1920.misc
deleted file mode 100644
index 4c59527599..0000000000
--- a/changelog.d/1920.misc
+++ /dev/null
@@ -1 +0,0 @@
-RoomList: introduce incremental loading to improve performances.
diff --git a/changelog.d/1940.bugfix b/changelog.d/1940.bugfix
deleted file mode 100644
index d4cc9aa187..0000000000
--- a/changelog.d/1940.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix scaling of timeline images: don't crop, don't set min/max aspect ratio values.
diff --git a/changelog.d/1944.misc b/changelog.d/1944.misc
deleted file mode 100644
index 79e271fa8b..0000000000
--- a/changelog.d/1944.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add toggle in the notification settings to disable notifications for room invites.
diff --git a/changelog.d/1950.bugfix b/changelog.d/1950.bugfix
deleted file mode 100644
index 2253ca74b8..0000000000
--- a/changelog.d/1950.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rendering of user name with vertical text by clipping the text.
diff --git a/changelog.d/1965.misc b/changelog.d/1965.misc
deleted file mode 100644
index 49132f82ce..0000000000
--- a/changelog.d/1965.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update rendering of Emojis displayed during verification.
diff --git a/changelog.d/1970.bugfix b/changelog.d/1970.bugfix
deleted file mode 100644
index 7bdddd1396..0000000000
--- a/changelog.d/1970.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not render `roomId` if the room has no canonical alias.
diff --git a/changelog.d/1979.misc b/changelog.d/1979.misc
deleted file mode 100644
index 623a422481..0000000000
--- a/changelog.d/1979.misc
+++ /dev/null
@@ -1 +0,0 @@
-Hide sender info in direct rooms
diff --git a/changelog.d/1991.bugfix b/changelog.d/1991.bugfix
deleted file mode 100644
index e1dfcdcb2a..0000000000
--- a/changelog.d/1991.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix avatar not displayed in notification when the app is not in background
diff --git a/changelog.d/1991.misc b/changelog.d/1991.misc
deleted file mode 100644
index 05a0367bed..0000000000
--- a/changelog.d/1991.misc
+++ /dev/null
@@ -1 +0,0 @@
-Render images in Notification
diff --git a/changelog.d/2014.feature b/changelog.d/2014.feature
deleted file mode 100644
index a53efee89c..0000000000
--- a/changelog.d/2014.feature
+++ /dev/null
@@ -1 +0,0 @@
-Poll history of a room is now accessible from the room details screen.
diff --git a/changelog.d/2022.feature b/changelog.d/2022.feature
deleted file mode 100644
index 286fde741a..0000000000
--- a/changelog.d/2022.feature
+++ /dev/null
@@ -1 +0,0 @@
-Always close the invite list screen when there is no more invite.
diff --git a/changelog.d/2031.misc b/changelog.d/2031.misc
deleted file mode 100644
index 8b9039fa02..0000000000
--- a/changelog.d/2031.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only process content.json from Localazy.
diff --git a/changelog.d/2032.misc b/changelog.d/2032.misc
deleted file mode 100644
index 339ca0c68a..0000000000
--- a/changelog.d/2032.misc
+++ /dev/null
@@ -1 +0,0 @@
- Always show user avatar in message action sheet
diff --git a/changelog.d/2037.bugfix b/changelog.d/2037.bugfix
deleted file mode 100644
index e879e17262..0000000000
--- a/changelog.d/2037.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix wording in room invite members view: `Send` -> `Invite`.
diff --git a/changelog.d/2060.bugfix b/changelog.d/2060.bugfix
deleted file mode 100644
index d91be16098..0000000000
--- a/changelog.d/2060.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Timestamp positioning was broken, specially for edited messages.
diff --git a/changelog.d/2062.misc b/changelog.d/2062.misc
deleted file mode 100644
index dea482098b..0000000000
--- a/changelog.d/2062.misc
+++ /dev/null
@@ -1 +0,0 @@
-Hide room list dropdown menu.
diff --git a/changelog.d/2066.bugfix b/changelog.d/2066.bugfix
deleted file mode 100644
index 13ee4584da..0000000000
--- a/changelog.d/2066.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Emojis in custom reaction bottom sheet are too tiny.
diff --git a/changelog.d/2087.misc b/changelog.d/2087.misc
deleted file mode 100644
index d04eb24a7c..0000000000
--- a/changelog.d/2087.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable Chat backup, Mentions and Read Receipt in release.
diff --git a/fastlane/metadata/android/en-US/changelogs/40004000.txt b/fastlane/metadata/android/en-US/changelogs/40004000.txt
new file mode 100644
index 0000000000..811c504542
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40004000.txt
@@ -0,0 +1,13 @@
+Main changes in this version:
+
+- New timeline messages rendering.
+- Added support for user mentions.
+- Enabled chat backup so you can restore previous message history.
+- Added read receipts.
+- Several improvements to polls, including poll history.
+- Several UI/UX improvements.
+- Set a default power level to join room calls.
+- Added an option to disable notifications for invites.
+- Fixed a bug with the text composer and suggestions on Android 14.
+
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 76acdc2693..63988c218c 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -51,12 +51,12 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
 
 // Note: 2 digits max for each value
 private const val versionMajor = 0
-private const val versionMinor = 3
+private const val versionMinor = 4
 
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-private const val versionPatch = 4
+private const val versionPatch = 0
 
 object Versions {
     val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch