diff --git a/CHANGES.md b/CHANGES.md
index 4615ec8ff0..7f3488a3b0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,67 @@
+Changes in Element v1.4.36 (2022-09-10)
+=======================================
+
+Features ✨
+----------
+ - Suggest @room when @channel, @everyone, or @here is typed in composer ([#6529](https://github.com/vector-im/element-android/issues/6529))
+ - [App Layout] New empty states for home screen ([#6835](https://github.com/vector-im/element-android/issues/6835))
+ - Improves Developer Mode Debug Button UX and adds it to New App Layout ([#6871](https://github.com/vector-im/element-android/issues/6871))
+ - [App Layout] - Invites now show empty screen after you reject last invite ([#6876](https://github.com/vector-im/element-android/issues/6876))
+ - [App Layout] New App Layout is enabled by default ([#6958](https://github.com/vector-im/element-android/issues/6958))
+ - Try to detect devices that lack Opus encoder support, use bundled libopus library for those. ([#7010](https://github.com/vector-im/element-android/issues/7010))
+ - Adds New App Layout into Labs ([#7038](https://github.com/vector-im/element-android/issues/7038))
+
+Bugfixes 🐛
+----------
+ - [App Layout] - space switcher now has empty state ([#6754](https://github.com/vector-im/element-android/issues/6754))
+ - Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings ([#6844](https://github.com/vector-im/element-android/issues/6844))
+ - Fix long incremental sync. ([#6917](https://github.com/vector-im/element-android/issues/6917))
+ - Fix low occurrence crashes. ([#6967](https://github.com/vector-im/element-android/issues/6967))
+ - FTUE - Fixes optional email registration step always being mandatory ([#6969](https://github.com/vector-im/element-android/issues/6969))
+ - Fix crash when opening an unknown room ([#6978](https://github.com/vector-im/element-android/issues/6978))
+ - Fix crash on PIN code settings screen. ([#6979](https://github.com/vector-im/element-android/issues/6979))
+ - Fix autoplayed animated stickers
+  Increase sticker size ([#6982](https://github.com/vector-im/element-android/issues/6982))
+ - Catch race condition crash in voice recording ([#6989](https://github.com/vector-im/element-android/issues/6989))
+ - Fix invite to room when in a space buttons not working. ([#7054](https://github.com/vector-im/element-android/issues/7054))
+ - Fix push with FCM ([#7068](https://github.com/vector-im/element-android/issues/7068))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Create the DM and navigate to the new room after sending an event ([#5525](https://github.com/vector-im/element-android/issues/5525))
+ - [App Layout] Bottom navigation tabs are removed for new home screen ([#6565](https://github.com/vector-im/element-android/issues/6565))
+ - [App Layout] fixed space switching dialog measured with wrong height sometimes ([#6750](https://github.com/vector-im/element-android/issues/6750))
+ - [App Layout] Fabs doesn't go off screen anymore ([#6765](https://github.com/vector-im/element-android/issues/6765))
+ - [New Layout] Adds back navigation through spaces ([#6877](https://github.com/vector-im/element-android/issues/6877))
+ - [App Layout] new room invites screen ([#6889](https://github.com/vector-im/element-android/issues/6889))
+ - [Device Manager] Current Session Section ([#6902](https://github.com/vector-im/element-android/issues/6902))
+ - [New Layout] Changes space sheet to accordion-style with expandable subspaces ([#6907](https://github.com/vector-im/element-android/issues/6907))
+ - [New Layout] Adds space invites ([#6924](https://github.com/vector-im/element-android/issues/6924))
+ - [Device Manager] Other Sessions Section ([#6945](https://github.com/vector-im/element-android/issues/6945))
+ - [App Layout] fixed invites count badge bottom margin on a home screen ([#6947](https://github.com/vector-im/element-android/issues/6947))
+ - [Devices Management] Session overview screen ([#6961](https://github.com/vector-im/element-android/issues/6961))
+ - [Device Manager] Render Security Recommendations ([#6964](https://github.com/vector-im/element-android/issues/6964))
+ - [New Layout] Improves talkback accessibility ([#7016](https://github.com/vector-im/element-android/issues/7016))
+ - [New Layout] Changes space icon in fab and in release notes screen ([#7039](https://github.com/vector-im/element-android/issues/7039))
+ - [New Layout] Adds header to spaces bottom sheet ([#7040](https://github.com/vector-im/element-android/issues/7040))
+ - [Devices Management] Refactor some code to improve testability ([#7043](https://github.com/vector-im/element-android/issues/7043))
+
+Improved Documentation 📚
+------------------------
+ - Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor. ([#6727](https://github.com/vector-im/element-android/issues/6727))
+
+Other changes
+-------------
+ - Creates a dedicated strings module ([#3955](https://github.com/vector-im/element-android/issues/3955))
+ - Converts the vector module to a library with a parent vector-app application module ([#6407](https://github.com/vector-im/element-android/issues/6407))
+ - [App Layout] Obsolete settings are not shown when App Layout flag is enabled ([#6646](https://github.com/vector-im/element-android/issues/6646))
+ - Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members. ([#6894](https://github.com/vector-im/element-android/issues/6894))
+ - Log basic Http information in production. ([#6925](https://github.com/vector-im/element-android/issues/6925))
+ - Focus input field when editing homeserver address to speed up login and registration. ([#6926](https://github.com/vector-im/element-android/issues/6926))
+ - Smaff refactor of UnifiedPushHelper ([#6936](https://github.com/vector-im/element-android/issues/6936))
+ - CI: only run sonarqube task when token is known ([#7057](https://github.com/vector-im/element-android/issues/7057))
+
+
 Changes in Element v1.4.34 (2022-08-23)
 =======================================
 
diff --git a/changelog.d/3955.misc b/changelog.d/3955.misc
deleted file mode 100644
index 4e8fbeb4d8..0000000000
--- a/changelog.d/3955.misc
+++ /dev/null
@@ -1 +0,0 @@
-Creates a dedicated strings module
diff --git a/changelog.d/5525.wip b/changelog.d/5525.wip
deleted file mode 100644
index 0d54c06b6a..0000000000
--- a/changelog.d/5525.wip
+++ /dev/null
@@ -1 +0,0 @@
-Create DM room only on first message - Create the DM and navigate to the new room after sending an event
diff --git a/changelog.d/6407.misc b/changelog.d/6407.misc
deleted file mode 100644
index 3f7a27fc01..0000000000
--- a/changelog.d/6407.misc
+++ /dev/null
@@ -1 +0,0 @@
-Converts the vector module to a library with a parent vector-app application module
diff --git a/changelog.d/6529.feature b/changelog.d/6529.feature
deleted file mode 100644
index dc51d1dad0..0000000000
--- a/changelog.d/6529.feature
+++ /dev/null
@@ -1 +0,0 @@
-Suggest @room when @channel, @everyone, or @here is typed in composer
\ No newline at end of file
diff --git a/changelog.d/6565.wip b/changelog.d/6565.wip
deleted file mode 100644
index 0e89c63e75..0000000000
--- a/changelog.d/6565.wip
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] Bottom navigation tabs are removed for new home screen
diff --git a/changelog.d/6646.misc b/changelog.d/6646.misc
deleted file mode 100644
index 0f2e3f0881..0000000000
--- a/changelog.d/6646.misc
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] Obsolete settings are not shown when App Layout flag is enabled
diff --git a/changelog.d/6727.doc b/changelog.d/6727.doc
deleted file mode 100644
index ab65e7a5b7..0000000000
--- a/changelog.d/6727.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor.
diff --git a/changelog.d/6750.wip b/changelog.d/6750.wip
deleted file mode 100644
index 2e18110c97..0000000000
--- a/changelog.d/6750.wip
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] fixed space switching dialog measured with wrong height sometimes
diff --git a/changelog.d/6754.bugfix b/changelog.d/6754.bugfix
deleted file mode 100644
index e9f6960595..0000000000
--- a/changelog.d/6754.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] - space switcher now has empty state
diff --git a/changelog.d/6765.wip b/changelog.d/6765.wip
deleted file mode 100644
index ccdc1c025f..0000000000
--- a/changelog.d/6765.wip
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] Fabs doesn't go off screen anymore
diff --git a/changelog.d/6835.feature b/changelog.d/6835.feature
deleted file mode 100644
index e4e610f7e0..0000000000
--- a/changelog.d/6835.feature
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] New empty states for home screen
diff --git a/changelog.d/6844.bugfix b/changelog.d/6844.bugfix
deleted file mode 100644
index a2babaaa6d..0000000000
--- a/changelog.d/6844.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings
diff --git a/changelog.d/6871.feature b/changelog.d/6871.feature
deleted file mode 100644
index 313be1a602..0000000000
--- a/changelog.d/6871.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improves Developer Mode Debug Button UX and adds it to New App Layout
diff --git a/changelog.d/6876.feature b/changelog.d/6876.feature
deleted file mode 100644
index 12a2b78a1e..0000000000
--- a/changelog.d/6876.feature
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] - Invites now show empty screen after you reject last invite
diff --git a/changelog.d/6877.wip b/changelog.d/6877.wip
deleted file mode 100644
index d1e1c7c82d..0000000000
--- a/changelog.d/6877.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Adds back navigation through spaces
diff --git a/changelog.d/6889.wip b/changelog.d/6889.wip
deleted file mode 100644
index 067973aad9..0000000000
--- a/changelog.d/6889.wip
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] new room invites screen
diff --git a/changelog.d/6894.misc b/changelog.d/6894.misc
deleted file mode 100644
index abb1a69a71..0000000000
--- a/changelog.d/6894.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members.
diff --git a/changelog.d/6902.wip b/changelog.d/6902.wip
deleted file mode 100644
index 8c982cc9ae..0000000000
--- a/changelog.d/6902.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Current Session Section
diff --git a/changelog.d/6907.wip b/changelog.d/6907.wip
deleted file mode 100644
index a8d887c66b..0000000000
--- a/changelog.d/6907.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Changes space sheet to accordion-style with expandable subspaces
diff --git a/changelog.d/6917.bugfix b/changelog.d/6917.bugfix
deleted file mode 100644
index 7ddcc16d9a..0000000000
--- a/changelog.d/6917.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix long incremental sync.
diff --git a/changelog.d/6924.wip b/changelog.d/6924.wip
deleted file mode 100644
index 11ff4a1eb2..0000000000
--- a/changelog.d/6924.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Adds space invites
diff --git a/changelog.d/6925.misc b/changelog.d/6925.misc
deleted file mode 100644
index f494b76b56..0000000000
--- a/changelog.d/6925.misc
+++ /dev/null
@@ -1 +0,0 @@
-Log basic Http information in production.
diff --git a/changelog.d/6926.misc b/changelog.d/6926.misc
deleted file mode 100644
index dc1330d9fc..0000000000
--- a/changelog.d/6926.misc
+++ /dev/null
@@ -1 +0,0 @@
-Focus input field when editing homeserver address to speed up login and registration.
\ No newline at end of file
diff --git a/changelog.d/6936.misc b/changelog.d/6936.misc
deleted file mode 100644
index f032ad9805..0000000000
--- a/changelog.d/6936.misc
+++ /dev/null
@@ -1 +0,0 @@
-Smaff refactor of UnifiedPushHelper
diff --git a/changelog.d/6945.wip b/changelog.d/6945.wip
deleted file mode 100644
index 6f5916a8c2..0000000000
--- a/changelog.d/6945.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Other Sessions Section
diff --git a/changelog.d/6947.wip b/changelog.d/6947.wip
deleted file mode 100644
index 9a3e13cddb..0000000000
--- a/changelog.d/6947.wip
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] fixed invites count badge bottom margin on a home screen
diff --git a/changelog.d/6958.feature b/changelog.d/6958.feature
deleted file mode 100644
index b508ff19a9..0000000000
--- a/changelog.d/6958.feature
+++ /dev/null
@@ -1 +0,0 @@
-[App Layout] New App Layout is enabled by default
diff --git a/changelog.d/6961.wip b/changelog.d/6961.wip
deleted file mode 100644
index 2d271da8c1..0000000000
--- a/changelog.d/6961.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Devices Management] Session overview screen
diff --git a/changelog.d/6964.wip b/changelog.d/6964.wip
deleted file mode 100644
index f96dfe41ed..0000000000
--- a/changelog.d/6964.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Device Manager] Render Security Recommendations
diff --git a/changelog.d/6967.bugfix b/changelog.d/6967.bugfix
deleted file mode 100644
index e2a1f70532..0000000000
--- a/changelog.d/6967.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix low occurrence crashes.
diff --git a/changelog.d/6969.bugfix b/changelog.d/6969.bugfix
deleted file mode 100644
index 4f3a161b41..0000000000
--- a/changelog.d/6969.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-FTUE - Fixes optional email registration step always being mandatory
diff --git a/changelog.d/6978.bugfix b/changelog.d/6978.bugfix
deleted file mode 100644
index 878730062b..0000000000
--- a/changelog.d/6978.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash when opening an unknown room
diff --git a/changelog.d/6979.bugfix b/changelog.d/6979.bugfix
deleted file mode 100644
index ee43e83e96..0000000000
--- a/changelog.d/6979.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash on PIN code settings screen.
diff --git a/changelog.d/6982.bugfix b/changelog.d/6982.bugfix
deleted file mode 100644
index baa75d9c15..0000000000
--- a/changelog.d/6982.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix autoplayed animated stickers
-Increase sticker size
diff --git a/changelog.d/6989.bugfix b/changelog.d/6989.bugfix
deleted file mode 100644
index cf740ca741..0000000000
--- a/changelog.d/6989.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Catch race condition crash in voice recording
diff --git a/changelog.d/7010.feature b/changelog.d/7010.feature
deleted file mode 100644
index d6c7c85b3e..0000000000
--- a/changelog.d/7010.feature
+++ /dev/null
@@ -1 +0,0 @@
-Try to detect devices that lack Opus encoder support, use bundled libopus library for those.
diff --git a/changelog.d/7016.wip b/changelog.d/7016.wip
deleted file mode 100644
index 6918991a86..0000000000
--- a/changelog.d/7016.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Improves talkback accessibility
diff --git a/changelog.d/7038.feature b/changelog.d/7038.feature
deleted file mode 100644
index b7a0fbce6e..0000000000
--- a/changelog.d/7038.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds New App Layout into Labs
diff --git a/changelog.d/7039.wip b/changelog.d/7039.wip
deleted file mode 100644
index 5059029a0e..0000000000
--- a/changelog.d/7039.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Changes space icon in fab and in release notes screen
diff --git a/changelog.d/7040.wip b/changelog.d/7040.wip
deleted file mode 100644
index 124bad184b..0000000000
--- a/changelog.d/7040.wip
+++ /dev/null
@@ -1 +0,0 @@
-[New Layout] Adds header to spaces bottom sheet
diff --git a/changelog.d/7043.wip b/changelog.d/7043.wip
deleted file mode 100644
index 3c9b7731bf..0000000000
--- a/changelog.d/7043.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Devices Management] Refactor some code to improve testability
diff --git a/changelog.d/7054.bugfix b/changelog.d/7054.bugfix
deleted file mode 100644
index 9cfda8ebe3..0000000000
--- a/changelog.d/7054.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix invite to room when in a space buttons not working.
diff --git a/changelog.d/7057.misc b/changelog.d/7057.misc
deleted file mode 100644
index ded1229319..0000000000
--- a/changelog.d/7057.misc
+++ /dev/null
@@ -1 +0,0 @@
-CI: only run sonarqube task when token is known
diff --git a/changelog.d/7068.bugfix b/changelog.d/7068.bugfix
deleted file mode 100644
index 448dcdd46c..0000000000
--- a/changelog.d/7068.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix push with FCM