diff --git a/CHANGES.md b/CHANGES.md
index 53518bf12..813f8f297 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,40 @@
+## Changes in 1.6.9 (2021-12-07)
+
+✨ Features
+
+- Allow audio file attachments to be played back inline by reusing the existing voice message UI. Prevent unnecessary conversions if final file already exists on disk. ([#4753](https://github.com/vector-im/element-ios/issues/4753))
+- SpaceExploreRoomViewModel: Support pagination in the Space Summary API ([#4893](https://github.com/vector-im/element-ios/issues/4893))
+- Adds clientPermalinkBaseUrl for a custom permalink base url. ([#4981](https://github.com/vector-im/element-ios/issues/4981))
+- Remember keyboard layout per room and restore it when opening the room again. ([#5067](https://github.com/vector-im/element-ios/issues/5067))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.13](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.13)).
+- Forward original message content and remove the need to re-upload media. ([#5014](https://github.com/vector-im/element-ios/issues/5014))
+- Use DTCoreText's callback option to sanitise formatted messages ([#5165](https://github.com/vector-im/element-ios/issues/5165))
+
+🐛 Bugfixes
+
+- Remove duplicate sources for some strings files in Riot/target.yml. ([#3908](https://github.com/vector-im/element-ios/issues/3908))
+- Invalid default value set for clientPermalinkBaseUrl. ([#5098](https://github.com/vector-im/element-ios/issues/5098))
+- Ignore badge updates from virtual rooms. ([#5155](https://github.com/vector-im/element-ios/issues/5155))
+- Fix rooms that should be hidden(such as virtual rooms) from showing. ([#5185](https://github.com/vector-im/element-ios/issues/5185))
+- Improve generated Swift header imports. ([#5194](https://github.com/vector-im/element-ios/issues/5194))
+- Fix bug where VoIP calls would not connect reliably after signout/signin. ([#5199](https://github.com/vector-im/element-ios/issues/5199))
+
+🧱 Build
+
+- Only run Build CI on develop, as it is already covered by Tests and Alpha. ([#5112](https://github.com/vector-im/element-ios/pull/5112))
+- Add concurrency to the GitHub workflows to auto-cancel older runs of each action for PRs. ([#5039](https://github.com/vector-im/element-ios/issues/5039))
+
+Others
+
+- Improve the Obj-C Generated Interface Header Name definition ([#4722](https://github.com/vector-im/element-ios/issues/4722))
+- Fix redundancy in heading in the bug report issue form ([#4984](https://github.com/vector-im/element-ios/issues/4984))
+- Update automation for issue triage ([#5153](https://github.com/vector-im/element-ios/issues/5153))
+- Improve issue automation workflows ([#5235](https://github.com/vector-im/element-ios/issues/5235))
+
+
 ## Changes in 1.6.8 (2021-11-17)
 
 🙌 Improvements
diff --git a/Podfile b/Podfile
index 5eeaa33f2..6c868bca4 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.20.10'
+$matrixSDKVersion = '= 0.20.13'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 2684759af..d0d2d36bb 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -59,29 +59,16 @@ PODS:
   - MatomoTracker (7.4.1):
     - MatomoTracker/Core (= 7.4.1)
   - MatomoTracker/Core (7.4.1)
-  - MatrixKit (0.16.10):
-    - Down (~> 0.11.0)
-    - DTCoreText (~> 1.6.25)
-    - HPGrowingTextView (~> 1.1)
-    - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.16.10)
-    - MatrixSDK (= 0.20.10)
-  - MatrixKit/Core (0.16.10):
-    - Down (~> 0.11.0)
-    - DTCoreText (~> 1.6.25)
-    - HPGrowingTextView (~> 1.1)
-    - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.20.10)
-  - MatrixSDK (0.20.10):
-    - MatrixSDK/Core (= 0.20.10)
-  - MatrixSDK/Core (0.20.10):
+  - MatrixSDK (0.20.13):
+    - MatrixSDK/Core (= 0.20.13)
+  - MatrixSDK/Core (0.20.13):
     - 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.20.10):
+  - MatrixSDK/JingleCallStack (0.20.13):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -117,18 +104,21 @@ PODS:
 
 DEPENDENCIES:
   - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
+  - Down (~> 0.11.0)
   - DSWaveformImage (~> 6.1.1)
+  - DTCoreText (~> 1.6.25)
   - ffmpeg-kit-ios-audio (~> 4.5)
   - FLEX (~> 4.5.0)
   - FlowCommoniOS (~> 1.12.0)
   - GBDeviceInfo (~> 6.6.0)
+  - HPGrowingTextView (~> 1.1)
   - Introspect (~> 0.1)
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
+  - libPhoneNumber-iOS (~> 0.9.13)
   - MatomoTracker (~> 7.4.1)
-  - MatrixKit (= 0.16.10)
-  - MatrixSDK
-  - MatrixSDK/JingleCallStack
+  - MatrixSDK (= 0.20.13)
+  - MatrixSDK/JingleCallStack (= 0.20.13)
   - OLMKit
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
@@ -168,7 +158,6 @@ SPEC REPOS:
     - LoggerAPI
     - Logging
     - MatomoTracker
-    - MatrixKit
     - MatrixSDK
     - OLMKit
     - ReadMoreTextView
@@ -210,8 +199,7 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
-  MatrixKit: c3f0bb056ceeb015e2f1688543ac4dbcf88bef2f
-  MatrixSDK: 0e2ed8fc6f004cac4b4ab46f038a86fe49ce4007
+  MatrixSDK: 945f082654830d7ae3a6e1e068b6dc22b2eae932
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: b6027801398f3743fc222f096faa85281b506e6c
@@ -226,6 +214,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 62cc1ccaaa8e126900f2d3a1d9def9ce814a3216
+PODFILE CHECKSUM: f58da67b86ec3b34619f1c61a33ce9a8ed35e28f
 
 COCOAPODS: 1.11.2
diff --git a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
index a9bea1d96..84ecb908a 100644
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
@@ -4,8 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/changelog.d/3908.bugfix b/changelog.d/3908.bugfix
deleted file mode 100644
index 823ffa095..000000000
--- a/changelog.d/3908.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Remove duplicate sources for some strings files in Riot/target.yml.
\ No newline at end of file
diff --git a/changelog.d/4722.misc b/changelog.d/4722.misc
deleted file mode 100644
index c1725155c..000000000
--- a/changelog.d/4722.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the Obj-C Generated Interface Header Name definition
\ No newline at end of file
diff --git a/changelog.d/4753.feature b/changelog.d/4753.feature
deleted file mode 100644
index 4cc044b9e..000000000
--- a/changelog.d/4753.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow audio file attachments to be played back inline by reusing the existing voice message UI. Prevent unnecessary conversions if final file already exists on disk.
\ No newline at end of file
diff --git a/changelog.d/4893.feature b/changelog.d/4893.feature
deleted file mode 100644
index 1cdb014be..000000000
--- a/changelog.d/4893.feature
+++ /dev/null
@@ -1 +0,0 @@
-SpaceExploreRoomViewModel: Support pagination in the Space Summary API
\ No newline at end of file
diff --git a/changelog.d/4981.feature b/changelog.d/4981.feature
deleted file mode 100644
index 2d1a3e79f..000000000
--- a/changelog.d/4981.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds clientPermalinkBaseUrl for a custom permalink base url.
diff --git a/changelog.d/4984.misc b/changelog.d/4984.misc
deleted file mode 100644
index 97b50d8c5..000000000
--- a/changelog.d/4984.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix redundancy in heading in the bug report issue form
diff --git a/changelog.d/5014.change b/changelog.d/5014.change
deleted file mode 100644
index 4c1c0e9a4..000000000
--- a/changelog.d/5014.change
+++ /dev/null
@@ -1 +0,0 @@
-Forward original message content and remove the need to re-upload media.
\ No newline at end of file
diff --git a/changelog.d/5039.build b/changelog.d/5039.build
deleted file mode 100644
index f791f36fb..000000000
--- a/changelog.d/5039.build
+++ /dev/null
@@ -1 +0,0 @@
-Add concurrency to the GitHub workflows to auto-cancel older runs of each action for PRs.
\ No newline at end of file
diff --git a/changelog.d/5067.feature b/changelog.d/5067.feature
deleted file mode 100644
index 53e0a66b5..000000000
--- a/changelog.d/5067.feature
+++ /dev/null
@@ -1 +0,0 @@
-Remember keyboard layout per room and restore it when opening the room again.
diff --git a/changelog.d/5098.bugfix b/changelog.d/5098.bugfix
deleted file mode 100644
index 77a90543a..000000000
--- a/changelog.d/5098.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Invalid default value set for clientPermalinkBaseUrl.
diff --git a/changelog.d/5153.misc b/changelog.d/5153.misc
deleted file mode 100644
index 5cfb4f32e..000000000
--- a/changelog.d/5153.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update automation for issue triage
diff --git a/changelog.d/5155.bugfix b/changelog.d/5155.bugfix
deleted file mode 100644
index 1e21bfc43..000000000
--- a/changelog.d/5155.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ignore badge updates from virtual rooms.
diff --git a/changelog.d/5165.change b/changelog.d/5165.change
deleted file mode 100644
index 59fea57b5..000000000
--- a/changelog.d/5165.change
+++ /dev/null
@@ -1 +0,0 @@
-Use DTCoreText's callback option to sanitise formatted messages
\ No newline at end of file
diff --git a/changelog.d/5185.bugfix b/changelog.d/5185.bugfix
deleted file mode 100644
index dfc98744d..000000000
--- a/changelog.d/5185.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rooms that should be hidden(such as virtual rooms) from showing.
diff --git a/changelog.d/5194.bugfix b/changelog.d/5194.bugfix
deleted file mode 100644
index 56d98768e..000000000
--- a/changelog.d/5194.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve generated Swift header imports.
diff --git a/changelog.d/5199.bugfix b/changelog.d/5199.bugfix
deleted file mode 100644
index d363f1449..000000000
--- a/changelog.d/5199.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where VoIP calls would not connect reliably after signout/signin.
diff --git a/changelog.d/5235.misc b/changelog.d/5235.misc
deleted file mode 100644
index 0044511ee..000000000
--- a/changelog.d/5235.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve issue automation workflows
diff --git a/changelog.d/pr-5112.build b/changelog.d/pr-5112.build
deleted file mode 100644
index 438d21339..000000000
--- a/changelog.d/pr-5112.build
+++ /dev/null
@@ -1 +0,0 @@
-Only run Build CI on develop, as it is already covered by Tests and Alpha.
\ No newline at end of file