diff --git a/CHANGES.md b/CHANGES.md
index 040d7e5b4..c7df60542 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,58 @@
+## Changes in 1.8.8 (2022-03-22)
+
+✨ Features
+
+- Invite to Space in room landing ([#5225](https://github.com/vector-im/element-ios/issues/5225))
+- Implement FAB journeys & rough edge warnings ([#5226](https://github.com/vector-im/element-ios/issues/5226))
+- Space panel overflow journeys & rough edge warnings ([#5227](https://github.com/vector-im/element-ios/issues/5227))
+- Let people know when rooms have moved. ([#5228](https://github.com/vector-im/element-ios/issues/5228))
+- Room Settings bottom sheet ([#5229](https://github.com/vector-im/element-ios/issues/5229))
+- Adding Rooms to Spaces ([#5230](https://github.com/vector-im/element-ios/issues/5230))
+- Spaces: Update room settings for Spaces ([#5231](https://github.com/vector-im/element-ios/issues/5231))
+- Spaces: Long press on rooms in space room lists ([#5232](https://github.com/vector-im/element-ios/issues/5232))
+- Space Settings ([#5233](https://github.com/vector-im/element-ios/issues/5233))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.0)).
+- Space creation: Added entire space creation flow. ([#5224](https://github.com/vector-im/element-ios/issues/5224))
+- Instrument metrics for the IA project. ([#5401](https://github.com/vector-im/element-ios/issues/5401))
+- RoomDataSource: Reload thread screen for the first message. ([#5441](https://github.com/vector-im/element-ios/issues/5441))
+- Change behaviour of avatar/self in left menu to match common paradigm and take user to their own profile/settings ([#5500](https://github.com/vector-im/element-ios/issues/5500))
+- Secure Backup: Add support for mandatory backup/verification ([#5745](https://github.com/vector-im/element-ios/issues/5745))
+- Thread Notifications: Open thread & reply to thread from notifications. ([#5749](https://github.com/vector-im/element-ios/issues/5749))
+- IA Metrics: added trigger to JoinedRoom event and implemented ViewRoom event ([#5769](https://github.com/vector-im/element-ios/issues/5769))
+- Activity Indicators: Replace user indicator presenting view controller with context ([#5780](https://github.com/vector-im/element-ios/issues/5780))
+- MXKEventFormatter: Extend reply fallback for also non-thread events. ([#5816](https://github.com/vector-im/element-ios/issues/5816))
+- Location sharing: Support multiple user annotation views on the map. ([#5827](https://github.com/vector-im/element-ios/issues/5827))
+- MXKRoomDataSource: Pass threadId of room data source for replies. ([#5829](https://github.com/vector-im/element-ios/issues/5829))
+- MXKEventFormatter: Fix edit fallback usage for edited events. ([#5841](https://github.com/vector-im/element-ios/issues/5841))
+- RoomViewController: Remove thread list bar button item badge count. ([#5853](https://github.com/vector-im/element-ios/issues/5853))
+
+🐛 Bugfixes
+
+- Fix user suggestions not showing up when re-entering a room. ([#5876](https://github.com/vector-im/element-ios/pull/5876))
+- Prevent the homescreen from resetting on every appearance. ([#5885](https://github.com/vector-im/element-ios/pull/5885))
+- UserSuggestionViewModel: Fix retain cycle ([#5058](https://github.com/vector-im/element-ios/issues/5058))
+- Green launch spinner is sometimes dismissed too early causing the incorrect onboarding screen to be displayed. ([#5472](https://github.com/vector-im/element-ios/issues/5472))
+- Home: Fix crash when pressing tabs ([#5547](https://github.com/vector-im/element-ios/issues/5547))
+- Selection impossible when filtering in add room screen. ([#5757](https://github.com/vector-im/element-ios/issues/5757))
+- Room: Refresh header when call actions become available (member count changes) ([#5800](https://github.com/vector-im/element-ios/issues/5800))
+- Share Extension: Stop logging crashes due to intentional exception that frees up memory and handle changes to MXRoom in the SDK. ([#5805](https://github.com/vector-im/element-ios/issues/5805))
+- Crash after leaving last space. ([#5825](https://github.com/vector-im/element-ios/issues/5825))
+- Authentication: Fix a crash that occurred when using the app with an account that had a soft logout. ([#5846](https://github.com/vector-im/element-ios/issues/5846))
+- MXAccount: Do not clear cache if there are no stored filters ([#5873](https://github.com/vector-im/element-ios/issues/5873))
+
+⚠️ API Changes
+
+- Rename scrollEdgesAppearance → scrollEdgeAppearance to match UIKit. ([#5826](https://github.com/vector-im/element-ios/pull/5826))
+
+🚧 In development 🚧
+
+- Onboarding: Add screens for setting a display name and avatar when signing up for the first time. ([#5652](https://github.com/vector-im/element-ios/issues/5652))
+- Location sharing: Handle live location banner view in room screen. ([#5857](https://github.com/vector-im/element-ios/issues/5857))
+
+
 ## Changes in 1.8.7 (2022-03-18)
 
 🙌 Improvements
diff --git a/Podfile b/Podfile
index 07fe178d6..fe7524f70 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.22.6'
+$matrixSDKVersion = '= 0.23.0'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 9b821e6f6..a0d822793 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.22.6):
-    - MatrixSDK/Core (= 0.22.6)
-  - MatrixSDK/Core (0.22.6):
+  - MatrixSDK (0.23.0):
+    - MatrixSDK/Core (= 0.23.0)
+  - MatrixSDK/Core (0.23.0):
     - 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.22.6):
+  - MatrixSDK/JingleCallStack (0.23.0):
     - 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.22.6)
-  - MatrixSDK/JingleCallStack (= 0.22.6)
+  - MatrixSDK (= 0.23.0)
+  - MatrixSDK/JingleCallStack (= 0.23.0)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -208,7 +208,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: f61997c146a03dfbf2ec0442bcae362c50666284
+  MatrixSDK: 5934f25944388513d7a379cd5e191a231ceed45f
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -225,6 +225,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 16aaf5e59ec902619fbfd799939f044728a92ab7
+PODFILE CHECKSUM: 426c919fd3f444aa747155bfcc20f9092573f1aa
 
 COCOAPODS: 1.11.3
diff --git a/changelog.d/5058.bugfix b/changelog.d/5058.bugfix
deleted file mode 100644
index c1bba1101..000000000
--- a/changelog.d/5058.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-UserSuggestionViewModel: Fix retain cycle
diff --git a/changelog.d/5224.change b/changelog.d/5224.change
deleted file mode 100644
index 4a5b7afec..000000000
--- a/changelog.d/5224.change
+++ /dev/null
@@ -1 +0,0 @@
-Space creation: Added entire space creation flow.
\ No newline at end of file
diff --git a/changelog.d/5225.feature b/changelog.d/5225.feature
deleted file mode 100644
index 72e7803bc..000000000
--- a/changelog.d/5225.feature
+++ /dev/null
@@ -1 +0,0 @@
-Invite to Space in room landing
\ No newline at end of file
diff --git a/changelog.d/5226.feature b/changelog.d/5226.feature
deleted file mode 100644
index bb8cf6992..000000000
--- a/changelog.d/5226.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implement FAB journeys & rough edge warnings
\ No newline at end of file
diff --git a/changelog.d/5227.feature b/changelog.d/5227.feature
deleted file mode 100644
index 906dfbfad..000000000
--- a/changelog.d/5227.feature
+++ /dev/null
@@ -1 +0,0 @@
-Space panel overflow journeys & rough edge warnings
\ No newline at end of file
diff --git a/changelog.d/5228.feature b/changelog.d/5228.feature
deleted file mode 100644
index d203ea007..000000000
--- a/changelog.d/5228.feature
+++ /dev/null
@@ -1 +0,0 @@
-Let people know when rooms have moved.
\ No newline at end of file
diff --git a/changelog.d/5229.feature b/changelog.d/5229.feature
deleted file mode 100644
index b58e36926..000000000
--- a/changelog.d/5229.feature
+++ /dev/null
@@ -1 +0,0 @@
-Room Settings bottom sheet
\ No newline at end of file
diff --git a/changelog.d/5230.feature b/changelog.d/5230.feature
deleted file mode 100644
index 825e377f7..000000000
--- a/changelog.d/5230.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adding Rooms to Spaces
\ No newline at end of file
diff --git a/changelog.d/5231.feature b/changelog.d/5231.feature
deleted file mode 100644
index 087438305..000000000
--- a/changelog.d/5231.feature
+++ /dev/null
@@ -1 +0,0 @@
-Spaces: Update room settings for Spaces
\ No newline at end of file
diff --git a/changelog.d/5232.feature b/changelog.d/5232.feature
deleted file mode 100644
index 6b0c6df48..000000000
--- a/changelog.d/5232.feature
+++ /dev/null
@@ -1 +0,0 @@
-Spaces: Long press on rooms in space room lists
\ No newline at end of file
diff --git a/changelog.d/5233.feature b/changelog.d/5233.feature
deleted file mode 100644
index 6db021b34..000000000
--- a/changelog.d/5233.feature
+++ /dev/null
@@ -1 +0,0 @@
-Space Settings
\ No newline at end of file
diff --git a/changelog.d/5401.change b/changelog.d/5401.change
deleted file mode 100644
index 141708597..000000000
--- a/changelog.d/5401.change
+++ /dev/null
@@ -1 +0,0 @@
-Instrument metrics for the IA project.
\ No newline at end of file
diff --git a/changelog.d/5441.change b/changelog.d/5441.change
deleted file mode 100644
index ba20e8807..000000000
--- a/changelog.d/5441.change
+++ /dev/null
@@ -1 +0,0 @@
-RoomDataSource: Reload thread screen for the first message.
diff --git a/changelog.d/5472.bugfix b/changelog.d/5472.bugfix
deleted file mode 100644
index 605cec44d..000000000
--- a/changelog.d/5472.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Green launch spinner is sometimes dismissed too early causing the incorrect onboarding screen to be displayed.
diff --git a/changelog.d/5500.change b/changelog.d/5500.change
deleted file mode 100644
index bcfe8ba8a..000000000
--- a/changelog.d/5500.change
+++ /dev/null
@@ -1 +0,0 @@
-Change behaviour of avatar/self in left menu to match common paradigm and take user to their own profile/settings
\ No newline at end of file
diff --git a/changelog.d/5547.bugfix b/changelog.d/5547.bugfix
deleted file mode 100644
index 570df2392..000000000
--- a/changelog.d/5547.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Home: Fix crash when pressing tabs
diff --git a/changelog.d/5652.wip b/changelog.d/5652.wip
deleted file mode 100644
index 0d173fbd5..000000000
--- a/changelog.d/5652.wip
+++ /dev/null
@@ -1 +0,0 @@
-Onboarding: Add screens for setting a display name and avatar when signing up for the first time.
\ No newline at end of file
diff --git a/changelog.d/5745.change b/changelog.d/5745.change
deleted file mode 100644
index e97d3d92b..000000000
--- a/changelog.d/5745.change
+++ /dev/null
@@ -1 +0,0 @@
-Secure Backup: Add support for mandatory backup/verification
diff --git a/changelog.d/5749.change b/changelog.d/5749.change
deleted file mode 100644
index cd5f91734..000000000
--- a/changelog.d/5749.change
+++ /dev/null
@@ -1 +0,0 @@
-Thread Notifications: Open thread & reply to thread from notifications.
diff --git a/changelog.d/5757.bugfix b/changelog.d/5757.bugfix
deleted file mode 100644
index 64b57e039..000000000
--- a/changelog.d/5757.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Selection impossible when filtering in add room screen.
\ No newline at end of file
diff --git a/changelog.d/5769.change b/changelog.d/5769.change
deleted file mode 100644
index d561dabb1..000000000
--- a/changelog.d/5769.change
+++ /dev/null
@@ -1 +0,0 @@
-IA Metrics: added trigger to JoinedRoom event and implemented ViewRoom event
\ No newline at end of file
diff --git a/changelog.d/5780.change b/changelog.d/5780.change
deleted file mode 100644
index 56128a61e..000000000
--- a/changelog.d/5780.change
+++ /dev/null
@@ -1 +0,0 @@
-Activity Indicators: Replace user indicator presenting view controller with context
diff --git a/changelog.d/5800.bugfix b/changelog.d/5800.bugfix
deleted file mode 100644
index 9bc811246..000000000
--- a/changelog.d/5800.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Room: Refresh header when call actions become available (member count changes)
diff --git a/changelog.d/5805.bugfix b/changelog.d/5805.bugfix
deleted file mode 100644
index 831afcca9..000000000
--- a/changelog.d/5805.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Share Extension: Stop logging crashes due to intentional exception that frees up memory and handle changes to MXRoom in the SDK.
diff --git a/changelog.d/5816.change b/changelog.d/5816.change
deleted file mode 100644
index 3e4652799..000000000
--- a/changelog.d/5816.change
+++ /dev/null
@@ -1 +0,0 @@
-MXKEventFormatter: Extend reply fallback for also non-thread events.
diff --git a/changelog.d/5825.bugfix b/changelog.d/5825.bugfix
deleted file mode 100644
index dd5050379..000000000
--- a/changelog.d/5825.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Crash after leaving last space.
\ No newline at end of file
diff --git a/changelog.d/5827.change b/changelog.d/5827.change
deleted file mode 100644
index e628ceda6..000000000
--- a/changelog.d/5827.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Support multiple user annotation views on the map.
diff --git a/changelog.d/5829.change b/changelog.d/5829.change
deleted file mode 100644
index 8d936b8ad..000000000
--- a/changelog.d/5829.change
+++ /dev/null
@@ -1 +0,0 @@
-MXKRoomDataSource: Pass threadId of room data source for replies.
diff --git a/changelog.d/5841.change b/changelog.d/5841.change
deleted file mode 100644
index a49b81fe7..000000000
--- a/changelog.d/5841.change
+++ /dev/null
@@ -1 +0,0 @@
-MXKEventFormatter: Fix edit fallback usage for edited events.
diff --git a/changelog.d/5846.bugfix b/changelog.d/5846.bugfix
deleted file mode 100644
index d37861d55..000000000
--- a/changelog.d/5846.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Fix a crash that occurred when using the app with an account that had a soft logout.
\ No newline at end of file
diff --git a/changelog.d/5853.change b/changelog.d/5853.change
deleted file mode 100644
index c35b4255a..000000000
--- a/changelog.d/5853.change
+++ /dev/null
@@ -1 +0,0 @@
-RoomViewController: Remove thread list bar button item badge count.
diff --git a/changelog.d/5857.wip b/changelog.d/5857.wip
deleted file mode 100644
index 80369f90c..000000000
--- a/changelog.d/5857.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Handle live location banner view in room screen.
\ No newline at end of file
diff --git a/changelog.d/5873.bugfix b/changelog.d/5873.bugfix
deleted file mode 100644
index cf3c09280..000000000
--- a/changelog.d/5873.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-MXAccount: Do not clear cache if there are no stored filters
diff --git a/changelog.d/pr-5826.api b/changelog.d/pr-5826.api
deleted file mode 100644
index e4847b927..000000000
--- a/changelog.d/pr-5826.api
+++ /dev/null
@@ -1 +0,0 @@
- 	Rename scrollEdgesAppearance → scrollEdgeAppearance to match UIKit.
\ No newline at end of file
diff --git a/changelog.d/pr-5876.bugfix b/changelog.d/pr-5876.bugfix
deleted file mode 100644
index aca03fdfa..000000000
--- a/changelog.d/pr-5876.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix user suggestions not showing up when re-entering a room.
\ No newline at end of file
diff --git a/changelog.d/pr-5885.bugfix b/changelog.d/pr-5885.bugfix
deleted file mode 100644
index 6fb004d5e..000000000
--- a/changelog.d/pr-5885.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent the homescreen from resetting on every appearance.
\ No newline at end of file