diff --git a/CHANGES.md b/CHANGES.md
index d8d1a5abf..9eec0ef00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,41 @@
+## Changes in 1.8.24 (2022-07-26)
+
+✨ Features
+
+- Enable the new authentication and personalisation flows in the onboarding coordinator. ([#5151](https://github.com/vector-im/element-ios/issues/5151))
+- Read tile server URL from .well-known (PSG-592) ([#6472](https://github.com/vector-im/element-ios/issues/6472))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.13](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.13)).
+- Replaces the usage of ffmpeg in the app again(Change was previously reverted). ([#6419](https://github.com/vector-im/element-ios/issues/6419))
+- Location sharing: Handle live location sharing start event reply in the timeline. ([#6423](https://github.com/vector-im/element-ios/issues/6423))
+- Location sharing: Show map credits on live location timeline tile only when map is shown. ([#6448](https://github.com/vector-im/element-ios/issues/6448))
+- Location sharing: Handle live location sharing delete in the timeline. ([#6470](https://github.com/vector-im/element-ios/issues/6470))
+- Location sharing: Display clearer error message when the user doesn't have permission to share location in the room. ([#6477](https://github.com/vector-im/element-ios/issues/6477))
+
+🐛 Bugfixes
+
+- Registration: Trim any whitespace away when verifying the user's email address. ([#2594](https://github.com/vector-im/element-ios/issues/2594))
+- AuthenticationViewController is now correctly configured for a deep link if the link is opened before the view gets shown. ([#6425](https://github.com/vector-im/element-ios/issues/6425))
+
+🧱 Build
+
+- Fix UI tests failing on CI but not being reported by prefixing all tests with `test`. ([#6432](https://github.com/vector-im/element-ios/issues/6432))
+
+🚧 In development 🚧
+
+- Update strings for FTUE authentication flow following final review. ([#6427](https://github.com/vector-im/element-ios/issues/6427))
+- Check for a phone number during login and send an MSISDN when using the new flow. ([#6428](https://github.com/vector-im/element-ios/issues/6428))
+- Fix ReCaptcha form sometimes being slow to react to taps in the new flow. ([#6429](https://github.com/vector-im/element-ios/issues/6429))
+- When entering a full MXID during registration on the new flow, update the homeserver to match. ([#6430](https://github.com/vector-im/element-ios/issues/6430))
+- Always perform the dummy stage in the registration wizard, irregardless of whether it is mandatory or optional. ([#6459](https://github.com/vector-im/element-ios/issues/6459))
+
+Others
+
+- Crypto: Convert verification request and transaction to protocols ([#6444](https://github.com/vector-im/element-ios/pull/6444))
+
+
 ## Changes in 1.8.23 (2022-07-15)
 
 🙌 Improvements
diff --git a/Podfile b/Podfile
index 0ef6e92ea..fdaa63bdf 100644
--- a/Podfile
+++ b/Podfile
@@ -16,7 +16,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.12'
+$matrixSDKVersion = '= 0.23.13'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 59349c206..9342eb19a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -56,9 +56,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.12):
-    - MatrixSDK/Core (= 0.23.12)
-  - MatrixSDK/Core (0.23.12):
+  - MatrixSDK (0.23.13):
+    - MatrixSDK/Core (= 0.23.13)
+  - MatrixSDK/Core (0.23.13):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -66,9 +66,9 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.23.12):
+  - MatrixSDK/CryptoSDK (0.23.13):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.12):
+  - MatrixSDK/JingleCallStack (0.23.13):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.1.0)
@@ -123,8 +123,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.12)
-  - MatrixSDK/JingleCallStack (= 0.23.12)
+  - MatrixSDK (= 0.23.13)
+  - MatrixSDK/JingleCallStack (= 0.23.13)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: cfc3316cbe8534ff9d4d7b49a1bc92dfb6b1296d
+  MatrixSDK: 4e14176a819982d9aec9d19e30afad9f63968a32
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c5629e0a7affba9c508e7c30572ada2200ab725d
+PODFILE CHECKSUM: c7d08e5d0654296048d53c9c6720783efcf897bd
 
 COCOAPODS: 1.11.2
diff --git a/changelog.d/2594.bugfix b/changelog.d/2594.bugfix
deleted file mode 100644
index 6a3588d1c..000000000
--- a/changelog.d/2594.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Registration: Trim any whitespace away when verifying the user's email address.
diff --git a/changelog.d/5151.feature b/changelog.d/5151.feature
deleted file mode 100644
index c0b37238c..000000000
--- a/changelog.d/5151.feature
+++ /dev/null
@@ -1 +0,0 @@
-Enable the new authentication and personalisation flows in the onboarding coordinator.
diff --git a/changelog.d/6419.change b/changelog.d/6419.change
deleted file mode 100644
index 350f4ca20..000000000
--- a/changelog.d/6419.change
+++ /dev/null
@@ -1 +0,0 @@
-Replaces the usage of ffmpeg in the app again(Change was previously reverted).
diff --git a/changelog.d/6423.change b/changelog.d/6423.change
deleted file mode 100644
index f09c38bc4..000000000
--- a/changelog.d/6423.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Handle live location sharing start event reply in the timeline.
diff --git a/changelog.d/6425.bugfix b/changelog.d/6425.bugfix
deleted file mode 100644
index c17ccbe62..000000000
--- a/changelog.d/6425.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-AuthenticationViewController is now correctly configured for a deep link if the link is opened before the view gets shown.
diff --git a/changelog.d/6427.wip b/changelog.d/6427.wip
deleted file mode 100644
index f0f77f75e..000000000
--- a/changelog.d/6427.wip
+++ /dev/null
@@ -1 +0,0 @@
-Update strings for FTUE authentication flow following final review.
diff --git a/changelog.d/6428.wip b/changelog.d/6428.wip
deleted file mode 100644
index ce86cb8b4..000000000
--- a/changelog.d/6428.wip
+++ /dev/null
@@ -1 +0,0 @@
-Check for a phone number during login and send an MSISDN when using the new flow. 
diff --git a/changelog.d/6429.wip b/changelog.d/6429.wip
deleted file mode 100644
index 2bdc44275..000000000
--- a/changelog.d/6429.wip
+++ /dev/null
@@ -1 +0,0 @@
-Fix ReCaptcha form sometimes being slow to react to taps in the new flow.
diff --git a/changelog.d/6430.wip b/changelog.d/6430.wip
deleted file mode 100644
index 4e4098f2e..000000000
--- a/changelog.d/6430.wip
+++ /dev/null
@@ -1 +0,0 @@
-When entering a full MXID during registration on the new flow, update the homeserver to match. 
diff --git a/changelog.d/6432.build b/changelog.d/6432.build
deleted file mode 100644
index 36fde2b9f..000000000
--- a/changelog.d/6432.build
+++ /dev/null
@@ -1 +0,0 @@
-Fix UI tests failing on CI but not being reported by prefixing all tests with `test`.
diff --git a/changelog.d/6448.change b/changelog.d/6448.change
deleted file mode 100644
index 11dacede8..000000000
--- a/changelog.d/6448.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Show map credits on live location timeline tile only when map is shown.
\ No newline at end of file
diff --git a/changelog.d/6459.wip b/changelog.d/6459.wip
deleted file mode 100644
index 90154a2f3..000000000
--- a/changelog.d/6459.wip
+++ /dev/null
@@ -1 +0,0 @@
-Always perform the dummy stage in the registration wizard, irregardless of whether it is mandatory or optional.
diff --git a/changelog.d/6470.change b/changelog.d/6470.change
deleted file mode 100644
index 283eab46f..000000000
--- a/changelog.d/6470.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Handle live location sharing delete in the timeline.
diff --git a/changelog.d/6472.feature b/changelog.d/6472.feature
deleted file mode 100644
index 9e7460834..000000000
--- a/changelog.d/6472.feature
+++ /dev/null
@@ -1 +0,0 @@
-Read tile server URL from .well-known (PSG-592)
diff --git a/changelog.d/6477.change b/changelog.d/6477.change
deleted file mode 100644
index 66c827421..000000000
--- a/changelog.d/6477.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Display clearer error message when the user doesn't have permission to share location in the room.
diff --git a/changelog.d/pr-6444.misc b/changelog.d/pr-6444.misc
deleted file mode 100644
index 5f9a6f1dc..000000000
--- a/changelog.d/pr-6444.misc
+++ /dev/null
@@ -1 +0,0 @@
-Crypto: Convert verification request and transaction to protocols