diff --git a/CHANGES.md b/CHANGES.md
index 8c2112418..c5c23b33f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,35 @@
+## Changes in 1.7.0 (2022-01-25)
+
+✨ Features
+
+- Message bubbles: Text message layout. ([#5208](https://github.com/vector-im/element-ios/issues/5208))
+- Message Bubbles: Layout for Media. ([#5209](https://github.com/vector-im/element-ios/issues/5209))
+- Message Bubbles: Support URL Previews. ([#5212](https://github.com/vector-im/element-ios/issues/5212))
+- Message Bubbles: Support reactions. ([#5214](https://github.com/vector-im/element-ios/issues/5214))
+- Added static location sharing sending and rendering support. ([#5298](https://github.com/vector-im/element-ios/issues/5298))
+- Message bubbles: Add settings and build flag. ([#5321](https://github.com/vector-im/element-ios/issues/5321))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.21.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.21.0)).
+- Using mutable room list fetch sort options after chaning them to be a structure. Adaptation to MXStore api changes. ([#4384](https://github.com/vector-im/element-ios/issues/4384))
+- Reduce grace period to report decryption failure ([#5345](https://github.com/vector-im/element-ios/issues/5345))
+
+🐛 Bugfixes
+
+- Fixed home screen not updating properly on theme changes. ([#4208](https://github.com/vector-im/element-ios/issues/4208))
+- Fixes DTMF(dial tones) during voice calls. ([#5375](https://github.com/vector-im/element-ios/issues/5375))
+- Fix crash when uploading a video on iPad when "Confirm size when sending" is enabled in settings. ([#5399](https://github.com/vector-im/element-ios/issues/5399))
+- Fix BuildSetting to show/hide the "Invite Friends" button in the side SideMenu. ([#5402](https://github.com/vector-im/element-ios/issues/5402))
+- Add BuildSetting to hide social login in favour of the simple SSO button. ([#5404](https://github.com/vector-im/element-ios/issues/5404))
+- Fix grey spinner showing indefinitely over the home view after launch. ([#5407](https://github.com/vector-im/element-ios/issues/5407))
+- RecentsViewController: Update tab bar badges on section-only updates. ([#5421](https://github.com/vector-im/element-ios/issues/5421))
+
+Others
+
+- Fix graphql warnings in issue workflow automation ([#5294](https://github.com/vector-im/element-ios/issues/5294))
+
+
 ## Changes in 1.6.12 (2022-01-11)
 
 🙌 Improvements
diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index f0f3b8161..08d0bfcfc 100644
--- a/Config/AppVersion.xcconfig
+++ b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.6.13
-CURRENT_PROJECT_VERSION = 1.6.13
+MARKETING_VERSION = 1.7.0
+CURRENT_PROJECT_VERSION = 1.7.0
diff --git a/Podfile b/Podfile
index 1898c52bb..495a84db4 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.16'
+$matrixSDKVersion = '= 0.21.0'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
diff --git a/Podfile.lock b/Podfile.lock
index 8d3206d35..366d83a2e 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.20.16):
-    - MatrixSDK/Core (= 0.20.16)
-  - MatrixSDK/Core (0.20.16):
+  - MatrixSDK (0.21.0):
+    - MatrixSDK/Core (= 0.21.0)
+  - MatrixSDK/Core (0.21.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.20.16):
+  - MatrixSDK/JingleCallStack (0.21.0):
     - JitsiMeetSDK (= 3.10.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
@@ -116,8 +116,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.16)
-  - MatrixSDK/JingleCallStack (= 0.20.16)
+  - MatrixSDK (= 0.21.0)
+  - MatrixSDK/JingleCallStack (= 0.21.0)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -209,7 +209,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: af6a70532bb43af59f43a1f4dae512a26afeab0b
+  MatrixSDK: cd98e3e4287b8a4f3a5bb47642beae80e8f62534
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -225,6 +225,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: c9a50c445e32b40b22fadd0f54b376f1bd624ebb
+PODFILE CHECKSUM: 39329dd448eb0ad10c396f84f854a18962ab1fc4
 
 COCOAPODS: 1.11.2
diff --git a/changelog.d/4208.bugfix b/changelog.d/4208.bugfix
deleted file mode 100644
index 135c79d86..000000000
--- a/changelog.d/4208.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed home screen not updating properly on theme changes.
\ No newline at end of file
diff --git a/changelog.d/4384.change b/changelog.d/4384.change
deleted file mode 100644
index 13dd82545..000000000
--- a/changelog.d/4384.change
+++ /dev/null
@@ -1 +0,0 @@
-Using mutable room list fetch sort options after chaning them to be a structure. Adaptation to MXStore api changes.
diff --git a/changelog.d/5208.feature b/changelog.d/5208.feature
deleted file mode 100644
index 1883900f3..000000000
--- a/changelog.d/5208.feature
+++ /dev/null
@@ -1 +0,0 @@
-Message bubbles: Text message layout.
\ No newline at end of file
diff --git a/changelog.d/5209.feature b/changelog.d/5209.feature
deleted file mode 100644
index 30ed3c629..000000000
--- a/changelog.d/5209.feature
+++ /dev/null
@@ -1 +0,0 @@
-Message Bubbles: Layout for Media.
\ No newline at end of file
diff --git a/changelog.d/5212.feature b/changelog.d/5212.feature
deleted file mode 100644
index abb4530c7..000000000
--- a/changelog.d/5212.feature
+++ /dev/null
@@ -1 +0,0 @@
-Message Bubbles: Support URL Previews.
\ No newline at end of file
diff --git a/changelog.d/5214.feature b/changelog.d/5214.feature
deleted file mode 100644
index 31d4c5a0e..000000000
--- a/changelog.d/5214.feature
+++ /dev/null
@@ -1 +0,0 @@
-Message Bubbles: Support reactions.
\ No newline at end of file
diff --git a/changelog.d/5294.misc b/changelog.d/5294.misc
deleted file mode 100644
index c1a31bb4a..000000000
--- a/changelog.d/5294.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix graphql warnings in issue workflow automation
diff --git a/changelog.d/5298.feature b/changelog.d/5298.feature
deleted file mode 100644
index 605f18e07..000000000
--- a/changelog.d/5298.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added static location sharing sending and rendering support.
\ No newline at end of file
diff --git a/changelog.d/5321.feature b/changelog.d/5321.feature
deleted file mode 100644
index 8fc5d69a2..000000000
--- a/changelog.d/5321.feature
+++ /dev/null
@@ -1 +0,0 @@
-Message bubbles: Add settings and build flag.
\ No newline at end of file
diff --git a/changelog.d/5345.change b/changelog.d/5345.change
deleted file mode 100644
index 80ee600a1..000000000
--- a/changelog.d/5345.change
+++ /dev/null
@@ -1 +0,0 @@
-Reduce grace period to report decryption failure
diff --git a/changelog.d/5375.bugfix b/changelog.d/5375.bugfix
deleted file mode 100644
index b8c851286..000000000
--- a/changelog.d/5375.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes DTMF(dial tones) during voice calls. 
diff --git a/changelog.d/5399.bugfix b/changelog.d/5399.bugfix
deleted file mode 100644
index 015ecfc41..000000000
--- a/changelog.d/5399.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash when uploading a video on iPad when "Confirm size when sending" is enabled in settings.
diff --git a/changelog.d/5402.bugfix b/changelog.d/5402.bugfix
deleted file mode 100644
index 44e0c482e..000000000
--- a/changelog.d/5402.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix BuildSetting to show/hide the "Invite Friends" button in the side SideMenu.
diff --git a/changelog.d/5404.bugfix b/changelog.d/5404.bugfix
deleted file mode 100644
index 1c829a4f0..000000000
--- a/changelog.d/5404.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add BuildSetting to hide social login in favour of the simple SSO button.
diff --git a/changelog.d/5407.bugfix b/changelog.d/5407.bugfix
deleted file mode 100644
index f4ed72863..000000000
--- a/changelog.d/5407.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix grey spinner showing indefinitely over the home view after launch.
diff --git a/changelog.d/5421.bugfix b/changelog.d/5421.bugfix
deleted file mode 100644
index 97de8c3cb..000000000
--- a/changelog.d/5421.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RecentsViewController: Update tab bar badges on section-only updates.