diff --git a/CHANGES.md b/CHANGES.md
index f3e7f3890..68cc98ab3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,59 @@
+## Changes in 1.8.11 (2022-04-05)
+
+✨ Features
+
+- RoomViewController: Display threads notice if not displayed before. ([#5770](https://github.com/vector-im/element-ios/issues/5770))
+- Addded support for Apple context menus in matrix items list screens ([#5953](https://github.com/vector-im/element-ios/issues/5953))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.2)).
+- Threads: Strip `ìn reply to` from thread summaries and latest messages. ([#5488](https://github.com/vector-im/element-ios/issues/5488))
+- Room: New loading indicators when joining room ([#5604](https://github.com/vector-im/element-ios/issues/5604))
+- Room: New loading indicators when creating a room ([#5606](https://github.com/vector-im/element-ios/issues/5606))
+- Location Sharing: Update UI on location sharing view ([#5720](https://github.com/vector-im/element-ios/issues/5720))
+- Update suggested room preview to behave the same way in all cases ([#5771](https://github.com/vector-im/element-ios/issues/5771))
+- RoomViewController: Enable thread menu option and display opt-in screen if threads disabled. ([#5772](https://github.com/vector-im/element-ios/issues/5772))
+- Add "Invite people" to the space menu in the left panel and update menu order ([#5810](https://github.com/vector-im/element-ios/issues/5810))
+- Allow empty Jitsi default URL in BuildSettings ([#5837](https://github.com/vector-im/element-ios/issues/5837))
+- Location sharing: Add the ability for the user to share static location of a pin anywhere on the map ([#5858](https://github.com/vector-im/element-ios/issues/5858))
+- Restrict UI components on authentication screen to readable width ([#5898](https://github.com/vector-im/element-ios/issues/5898))
+
+🐛 Bugfixes
+
+- Fixed the regular expression used for link detection in attributed strings. ([#5926](https://github.com/vector-im/element-ios/pull/5926))
+- Jitsi: fix app not leaving call when widget is removed ([#1575](https://github.com/vector-im/element-ios/issues/1575))
+- Space preview shows wrong number of members ([#4842](https://github.com/vector-im/element-ios/issues/4842))
+- Room: Enable joining a room via identifier from another home server ([#4858](https://github.com/vector-im/element-ios/issues/4858))
+- MXKRoomDataSource: Fix retain cycle ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Sync Spaces order with web ([#5134](https://github.com/vector-im/element-ios/issues/5134))
+- Fix “It is not possible to join an empty room” on some suggested rooms. ([#5170](https://github.com/vector-im/element-ios/issues/5170))
+- Fixed "Add Space" error message ([#5797](https://github.com/vector-im/element-ios/issues/5797))
+- RoomDataSource: Reload thread data source without notifying the screen for the first reply. ([#5838](https://github.com/vector-im/element-ios/issues/5838))
+- VoiceMessagePlainCell: Fix cell height by adding missing thread summary displayable conformance. ([#5870](https://github.com/vector-im/element-ios/issues/5870))
+- Authentication: Ensure the login button is always visible ([#5875](https://github.com/vector-im/element-ios/issues/5875))
+- Threads: Tweaks for design review. ([#5878](https://github.com/vector-im/element-ios/issues/5878))
+- Search: prevent crash when searching for rooms ([#5883](https://github.com/vector-im/element-ios/issues/5883))
+- Room: Fix typing performance by avoiding expensive UI operations ([#5906](https://github.com/vector-im/element-ios/issues/5906))
+- The "Swipe to see all rooms" hint is sometimes presented at the wrong time ([#5911](https://github.com/vector-im/element-ios/issues/5911))
+- Push notifications: show space preview if user taps invite notification ([#5915](https://github.com/vector-im/element-ios/issues/5915))
+- Fix session handling of the call presenter. ([#5938](https://github.com/vector-im/element-ios/issues/5938))
+- m.room.join_rules not properly set for private access ([#5943](https://github.com/vector-im/element-ios/issues/5943))
+- Fix for app occasionally getting stuck during launch after Login/Register. ([#5948](https://github.com/vector-im/element-ios/issues/5948))
+
+⚠️ API Changes
+
+- Remove unused Bindings in RoundedBorderTextField/Editor ([#5910](https://github.com/vector-im/element-ios/pull/5910))
+
+🗣 Translations
+
+- Translations: Enable all languages rather than waiting for an 80% translation. RTL languages are still disabled due to layout and formatting bugs. ([#5935](https://github.com/vector-im/element-ios/issues/5935))
+
+🚧 In development 🚧
+
+- Onboarding: Add celebration screen after display name and avatar screens. ([#5651](https://github.com/vector-im/element-ios/issues/5651))
+
+
 ## Changes in 1.8.10 (2022-03-31)
 
 🐛 Bugfixes
diff --git a/Podfile b/Podfile
index ec5c0420d..ec921a026 100644
--- a/Podfile
+++ b/Podfile
@@ -13,7 +13,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.1'
+$matrixSDKVersion = '= 0.23.2'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 761bfd2ad..1c2108fe2 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -56,16 +56,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.1):
-    - MatrixSDK/Core (= 0.23.1)
-  - MatrixSDK/Core (0.23.1):
+  - MatrixSDK (0.23.2):
+    - MatrixSDK/Core (= 0.23.2)
+  - MatrixSDK/Core (0.23.2):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.23.1):
+  - MatrixSDK/JingleCallStack (0.23.2):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -115,8 +115,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.1)
-  - MatrixSDK/JingleCallStack (= 0.23.1)
+  - MatrixSDK (= 0.23.2)
+  - MatrixSDK/JingleCallStack (= 0.23.2)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -208,7 +208,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 54d16aa08f3043fb1bcf639ef1ac5c589100f39f
+  MatrixSDK: ab6cbb1e8c437eac4f999be516b5e76c2bca9f6a
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -225,6 +225,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 820f04e07aa252459ecfa88d04da729daca4fcbb
+PODFILE CHECKSUM: 677ee0df159e298fde825885ea85e4ebfa8e32fd
 
 COCOAPODS: 1.11.2
diff --git a/changelog.d/1575.bugfix b/changelog.d/1575.bugfix
deleted file mode 100644
index 609b0150d..000000000
--- a/changelog.d/1575.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Jitsi: fix app not leaving call when widget is removed
diff --git a/changelog.d/4842.bugfix b/changelog.d/4842.bugfix
deleted file mode 100644
index 4e7ef2c03..000000000
--- a/changelog.d/4842.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Space preview shows wrong number of members
diff --git a/changelog.d/4858.bugfix b/changelog.d/4858.bugfix
deleted file mode 100644
index 2a7d342e8..000000000
--- a/changelog.d/4858.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Room: Enable joining a room via identifier from another home server
diff --git a/changelog.d/5058.bugfix b/changelog.d/5058.bugfix
deleted file mode 100644
index 8254bddd2..000000000
--- a/changelog.d/5058.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-MXKRoomDataSource: Fix retain cycle
diff --git a/changelog.d/5134.bugfix b/changelog.d/5134.bugfix
deleted file mode 100644
index 74df83c35..000000000
--- a/changelog.d/5134.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Sync Spaces order with web
\ No newline at end of file
diff --git a/changelog.d/5170.bugfix b/changelog.d/5170.bugfix
deleted file mode 100644
index 1ef0fceb3..000000000
--- a/changelog.d/5170.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix “It is not possible to join an empty room” on some suggested rooms.
diff --git a/changelog.d/5488.change b/changelog.d/5488.change
deleted file mode 100644
index e1b4dc675..000000000
--- a/changelog.d/5488.change
+++ /dev/null
@@ -1 +0,0 @@
-Threads: Strip `ìn reply to` from thread summaries and latest messages.
diff --git a/changelog.d/5604.change b/changelog.d/5604.change
deleted file mode 100644
index 23bb078ab..000000000
--- a/changelog.d/5604.change
+++ /dev/null
@@ -1 +0,0 @@
-Room: New loading indicators when joining room
diff --git a/changelog.d/5606.change b/changelog.d/5606.change
deleted file mode 100644
index 15c4fcd84..000000000
--- a/changelog.d/5606.change
+++ /dev/null
@@ -1 +0,0 @@
-Room: New loading indicators when creating a room
diff --git a/changelog.d/5651.wip b/changelog.d/5651.wip
deleted file mode 100644
index d5f2f46bb..000000000
--- a/changelog.d/5651.wip
+++ /dev/null
@@ -1 +0,0 @@
-Onboarding: Add celebration screen after display name and avatar screens.
\ No newline at end of file
diff --git a/changelog.d/5720.change b/changelog.d/5720.change
deleted file mode 100644
index 0b0eeee50..000000000
--- a/changelog.d/5720.change
+++ /dev/null
@@ -1 +0,0 @@
-Location Sharing: Update UI on location sharing view
diff --git a/changelog.d/5770.feature b/changelog.d/5770.feature
deleted file mode 100644
index c46dd12ea..000000000
--- a/changelog.d/5770.feature
+++ /dev/null
@@ -1 +0,0 @@
-RoomViewController: Display threads notice if not displayed before.
diff --git a/changelog.d/5771.change b/changelog.d/5771.change
deleted file mode 100644
index cef75bd46..000000000
--- a/changelog.d/5771.change
+++ /dev/null
@@ -1,2 +0,0 @@
-Update suggested room preview to behave the same way in all cases
-
diff --git a/changelog.d/5772.change b/changelog.d/5772.change
deleted file mode 100644
index 46210ef01..000000000
--- a/changelog.d/5772.change
+++ /dev/null
@@ -1 +0,0 @@
-RoomViewController: Enable thread menu option and display opt-in screen if threads disabled.
diff --git a/changelog.d/5797.bugfix b/changelog.d/5797.bugfix
deleted file mode 100644
index df2986a5d..000000000
--- a/changelog.d/5797.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed "Add Space" error message
diff --git a/changelog.d/5810.change b/changelog.d/5810.change
deleted file mode 100644
index 63585a270..000000000
--- a/changelog.d/5810.change
+++ /dev/null
@@ -1 +0,0 @@
-Add "Invite people" to the space menu in the left panel and update menu order
\ No newline at end of file
diff --git a/changelog.d/5837.change b/changelog.d/5837.change
deleted file mode 100644
index 59904919e..000000000
--- a/changelog.d/5837.change
+++ /dev/null
@@ -1 +0,0 @@
-Allow empty Jitsi default URL in BuildSettings
diff --git a/changelog.d/5838.bugfix b/changelog.d/5838.bugfix
deleted file mode 100644
index a35821948..000000000
--- a/changelog.d/5838.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RoomDataSource: Reload thread data source without notifying the screen for the first reply.
diff --git a/changelog.d/5858.change b/changelog.d/5858.change
deleted file mode 100644
index 3d45b56d9..000000000
--- a/changelog.d/5858.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add the ability for the user to share static location of a pin anywhere on the map
diff --git a/changelog.d/5870.bugfix b/changelog.d/5870.bugfix
deleted file mode 100644
index 7708f0b2d..000000000
--- a/changelog.d/5870.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-VoiceMessagePlainCell: Fix cell height by adding missing thread summary displayable conformance.
diff --git a/changelog.d/5875.bugfix b/changelog.d/5875.bugfix
deleted file mode 100644
index cbd4c0699..000000000
--- a/changelog.d/5875.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Ensure the login button is always visible
diff --git a/changelog.d/5878.bugfix b/changelog.d/5878.bugfix
deleted file mode 100644
index cbd1ee842..000000000
--- a/changelog.d/5878.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Threads: Tweaks for design review.
diff --git a/changelog.d/5883.bugfix b/changelog.d/5883.bugfix
deleted file mode 100644
index 27400193c..000000000
--- a/changelog.d/5883.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Search: prevent crash when searching for rooms
-
diff --git a/changelog.d/5898.change b/changelog.d/5898.change
deleted file mode 100644
index 9d83c6009..000000000
--- a/changelog.d/5898.change
+++ /dev/null
@@ -1 +0,0 @@
-Restrict UI components on authentication screen to readable width
diff --git a/changelog.d/5906.bugfix b/changelog.d/5906.bugfix
deleted file mode 100644
index 6015bc061..000000000
--- a/changelog.d/5906.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Room: Fix typing performance by avoiding expensive UI operations
diff --git a/changelog.d/5911.bugfix b/changelog.d/5911.bugfix
deleted file mode 100644
index edbb6c62b..000000000
--- a/changelog.d/5911.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The "Swipe to see all rooms" hint is sometimes presented at the wrong time
diff --git a/changelog.d/5915.bugfix b/changelog.d/5915.bugfix
deleted file mode 100644
index 88733d6ff..000000000
--- a/changelog.d/5915.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Push notifications: show space preview if user taps invite notification
diff --git a/changelog.d/5935.i18n b/changelog.d/5935.i18n
deleted file mode 100644
index cbfd09559..000000000
--- a/changelog.d/5935.i18n
+++ /dev/null
@@ -1 +0,0 @@
-Translations: Enable all languages rather than waiting for an 80% translation. RTL languages are still disabled due to layout and formatting bugs.
diff --git a/changelog.d/5938.bugfix b/changelog.d/5938.bugfix
deleted file mode 100644
index 929aff34c..000000000
--- a/changelog.d/5938.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix session handling of the call presenter.
diff --git a/changelog.d/5943.bugfix b/changelog.d/5943.bugfix
deleted file mode 100644
index ceae52674..000000000
--- a/changelog.d/5943.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-m.room.join_rules not properly set for private access
\ No newline at end of file
diff --git a/changelog.d/5948.bugfix b/changelog.d/5948.bugfix
deleted file mode 100644
index 09e891482..000000000
--- a/changelog.d/5948.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix for app occasionally getting stuck during launch after Login/Register.
diff --git a/changelog.d/5953.feature b/changelog.d/5953.feature
deleted file mode 100644
index 54f920031..000000000
--- a/changelog.d/5953.feature
+++ /dev/null
@@ -1 +0,0 @@
-Addded support for Apple context menus in matrix items list screens
diff --git a/changelog.d/pr-5910.api b/changelog.d/pr-5910.api
deleted file mode 100644
index ff9523166..000000000
--- a/changelog.d/pr-5910.api
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused Bindings in RoundedBorderTextField/Editor
\ No newline at end of file
diff --git a/changelog.d/pr-5926.bugfix b/changelog.d/pr-5926.bugfix
deleted file mode 100644
index f80a17cc2..000000000
--- a/changelog.d/pr-5926.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed the regular expression used for link detection in attributed strings.
\ No newline at end of file