diff --git a/CHANGES.md b/CHANGES.md
index 6cbe0c932..cf0cbbcc5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,37 @@
+## Changes in 1.8.14 (2022-05-05)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.4)).
+- Spaces: Bring leaving space experience in line with Web ([#4850](https://github.com/vector-im/element-ios/issues/4850))
+- Location sharing: Add cell for live location sharing in timeline ([#6029](https://github.com/vector-im/element-ios/issues/6029))
+- Location sharing: Add timer selector when start live location sharing ([#6071](https://github.com/vector-im/element-ios/issues/6071))
+- Location sharing: Connect SDK to location sharing timeline cell ([#6077](https://github.com/vector-im/element-ios/issues/6077))
+
+🐛 Bugfixes
+
+- RoomNavigationParameters: Fix initializer by not defining convenience. ([#5883](https://github.com/vector-im/element-ios/issues/5883))
+- Fail to open a sub space ([#5965](https://github.com/vector-im/element-ios/issues/5965))
+- RecentsViewController: Fix disappearing filter on search cancellation & empty view on the first screen appearing. ([#6076](https://github.com/vector-im/element-ios/issues/6076))
+- RoomsViewController: Avoid crash by fixing section index to scroll. ([#6086](https://github.com/vector-im/element-ios/issues/6086))
+- Search: Prevent crash when searching ([#6115](https://github.com/vector-im/element-ios/issues/6115))
+
+🗣 Translations
+
+- Localisations: Remove strings with bad formatting and add a run script to detect errors at compile time. ([#5990](https://github.com/vector-im/element-ios/issues/5990))
+
+🧱 Build
+
+- UI Tests: Fix broken tests and add a check on PRs. ([#6050](https://github.com/vector-im/element-ios/issues/6050))
+
+🚧 In development 🚧
+
+- Authentication: Begin implementing authentication flow with a Service, Registration screen and Server Selection screen. ([#5648](https://github.com/vector-im/element-ios/issues/5648))
+- Location sharing: Add live location viewer screen. ([#5723](https://github.com/vector-im/element-ios/issues/5723))
+- Location sharing: Support live location event in the timeline. ([#6057](https://github.com/vector-im/element-ios/issues/6057))
+- Location sharing: Integrate live location viewer screen with room screen. ([#6081](https://github.com/vector-im/element-ios/issues/6081))
+
+
 ## Changes in 1.8.13 (2022-04-20)
 
 ✨ Features
diff --git a/Podfile b/Podfile
index 1ab2e77df..03f7da41d 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.3'
+$matrixSDKVersion = '= 0.23.4'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 1cc3bd2e1..8bab1603c 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -57,16 +57,16 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.3):
-    - MatrixSDK/Core (= 0.23.3)
-  - MatrixSDK/Core (0.23.3):
+  - MatrixSDK (0.23.4):
+    - MatrixSDK/Core (= 0.23.4)
+  - MatrixSDK/Core (0.23.4):
     - 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.3):
+  - MatrixSDK/JingleCallStack (0.23.4):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -117,8 +117,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.3)
-  - MatrixSDK/JingleCallStack (= 0.23.3)
+  - MatrixSDK (= 0.23.4)
+  - MatrixSDK/JingleCallStack (= 0.23.4)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -212,7 +212,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 4a2d2ddc1bd58c63f40e14706306e1beaffea02d
+  MatrixSDK: 289fc3ccd63355a8597e4e5c2d2bc84e81b2fc9f
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -229,6 +229,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 39feedaf75b9a9287e4fe5309200e0493a9251a3
+PODFILE CHECKSUM: 62895026ad5dc86da75076998b66d80802dc868d
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2
diff --git a/changelog.d/4850.change b/changelog.d/4850.change
deleted file mode 100644
index 7318b0d61..000000000
--- a/changelog.d/4850.change
+++ /dev/null
@@ -1 +0,0 @@
-Spaces: Bring leaving space experience in line with Web
\ No newline at end of file
diff --git a/changelog.d/5648.wip b/changelog.d/5648.wip
deleted file mode 100644
index fd0fa5904..000000000
--- a/changelog.d/5648.wip
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Begin implementing authentication flow with a Service, Registration screen and Server Selection screen.
diff --git a/changelog.d/5723.wip b/changelog.d/5723.wip
deleted file mode 100644
index f5a7245dc..000000000
--- a/changelog.d/5723.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add live location viewer screen.
diff --git a/changelog.d/5883.bugfix b/changelog.d/5883.bugfix
deleted file mode 100644
index 0e15d3584..000000000
--- a/changelog.d/5883.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RoomNavigationParameters: Fix initializer by not defining convenience.
diff --git a/changelog.d/5965.bugfix b/changelog.d/5965.bugfix
deleted file mode 100644
index c3c7935d7..000000000
--- a/changelog.d/5965.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fail to open a sub space
diff --git a/changelog.d/5990.i18n b/changelog.d/5990.i18n
deleted file mode 100644
index 365463373..000000000
--- a/changelog.d/5990.i18n
+++ /dev/null
@@ -1 +0,0 @@
-Localisations: Remove strings with bad formatting and add a run script to detect errors at compile time.
diff --git a/changelog.d/6029.change b/changelog.d/6029.change
deleted file mode 100644
index 9a829ea07..000000000
--- a/changelog.d/6029.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add cell for live location sharing in timeline
diff --git a/changelog.d/6050.build b/changelog.d/6050.build
deleted file mode 100644
index 68d4e07c8..000000000
--- a/changelog.d/6050.build
+++ /dev/null
@@ -1 +0,0 @@
-UI Tests: Fix broken tests and add a check on PRs.
diff --git a/changelog.d/6057.wip b/changelog.d/6057.wip
deleted file mode 100644
index 004bcbfb3..000000000
--- a/changelog.d/6057.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Support live location event in the timeline.
\ No newline at end of file
diff --git a/changelog.d/6071.change b/changelog.d/6071.change
deleted file mode 100644
index f3cc8547a..000000000
--- a/changelog.d/6071.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add timer selector when start live location sharing
diff --git a/changelog.d/6076.bugfix b/changelog.d/6076.bugfix
deleted file mode 100644
index 93219791d..000000000
--- a/changelog.d/6076.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RecentsViewController: Fix disappearing filter on search cancellation & empty view on the first screen appearing.
diff --git a/changelog.d/6077.change b/changelog.d/6077.change
deleted file mode 100644
index 1f6d49036..000000000
--- a/changelog.d/6077.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Connect SDK to location sharing timeline cell
diff --git a/changelog.d/6081.wip b/changelog.d/6081.wip
deleted file mode 100644
index 77e131168..000000000
--- a/changelog.d/6081.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Integrate live location viewer screen with room screen.
\ No newline at end of file
diff --git a/changelog.d/6086.bugfix b/changelog.d/6086.bugfix
deleted file mode 100644
index fbb8b7202..000000000
--- a/changelog.d/6086.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RoomsViewController: Avoid crash by fixing section index to scroll.
diff --git a/changelog.d/6115.bugfix b/changelog.d/6115.bugfix
deleted file mode 100644
index 6998581e3..000000000
--- a/changelog.d/6115.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Search: Prevent crash when searching