diff --git a/CHANGES.md b/CHANGES.md
index f29f2243e..b09599d5e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+## Changes in 1.8.17 (2022-05-31)
+
+✨ Features
+
+- Authentication: Implement msisdn verification screen. ([#6182](https://github.com/vector-im/element-ios/issues/6182))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)).
+- Location sharing: Add a spinner view for starting state in timeline cell ([#6101](https://github.com/vector-im/element-ios/issues/6101))
+- Location sharing: Add labs flag for live location sharing ([#6195](https://github.com/vector-im/element-ios/issues/6195))
+
+🐛 Bugfixes
+
+- Added attempt at fixing random crashes while calculating timeline cell heights. ([#6188](https://github.com/vector-im/element-ios/pull/6188))
+- Fix ITMS Warning on CFBundleDocumentTypes ([#6159](https://github.com/vector-im/element-ios/issues/6159))
+- RoomViewController: Fix confirmation for RTL overridden links. ([#6208](https://github.com/vector-im/element-ios/issues/6208))
+- Fix issue with mention pill avatar consuming tap gestures ([#6212](https://github.com/vector-im/element-ios/issues/6212))
+
+🚧 In development 🚧
+
+- Authentication: Add Email/Terms/ReCaptcha screens into the flow. ([#5151](https://github.com/vector-im/element-ios/issues/5151))
+- Location sharing: Support sending live device location. ([#5722](https://github.com/vector-im/element-ios/issues/5722))
+- Authentication: Implement the LoginWizard to match Element Android. ([#5896](https://github.com/vector-im/element-ios/issues/5896))
+- Location sharing: Support restarting location sending after app kill. ([#6199](https://github.com/vector-im/element-ios/issues/6199))
+
+
 ## Changes in 1.8.16 (2022-05-19)
 
 🙌 Improvements
diff --git a/changelog.d/5151.wip b/changelog.d/5151.wip
deleted file mode 100644
index 231f7209c..000000000
--- a/changelog.d/5151.wip
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Add Email/Terms/ReCaptcha screens into the flow.
diff --git a/changelog.d/5722.wip b/changelog.d/5722.wip
deleted file mode 100644
index a019ef025..000000000
--- a/changelog.d/5722.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Support sending live device location.
diff --git a/changelog.d/5896.wip b/changelog.d/5896.wip
deleted file mode 100644
index 8d72840c9..000000000
--- a/changelog.d/5896.wip
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Implement the LoginWizard to match Element Android.
diff --git a/changelog.d/6101.change b/changelog.d/6101.change
deleted file mode 100644
index 9d7481782..000000000
--- a/changelog.d/6101.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add a spinner view for starting state in timeline cell
diff --git a/changelog.d/6159.bugfix b/changelog.d/6159.bugfix
deleted file mode 100644
index 1ad030d2a..000000000
--- a/changelog.d/6159.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ITMS Warning on CFBundleDocumentTypes
diff --git a/changelog.d/6182.feature b/changelog.d/6182.feature
deleted file mode 100644
index 5e6199fa1..000000000
--- a/changelog.d/6182.feature
+++ /dev/null
@@ -1 +0,0 @@
-Authentication: Implement msisdn verification screen.
diff --git a/changelog.d/6195.change b/changelog.d/6195.change
deleted file mode 100644
index 0cdb3a521..000000000
--- a/changelog.d/6195.change
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Add labs flag for live location sharing
diff --git a/changelog.d/6199.wip b/changelog.d/6199.wip
deleted file mode 100644
index 25f5b557b..000000000
--- a/changelog.d/6199.wip
+++ /dev/null
@@ -1 +0,0 @@
-Location sharing: Support restarting location sending after app kill.
diff --git a/changelog.d/6208.bugfix b/changelog.d/6208.bugfix
deleted file mode 100644
index b41e7d199..000000000
--- a/changelog.d/6208.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-RoomViewController: Fix confirmation for RTL overridden links.
diff --git a/changelog.d/6212.bugfix b/changelog.d/6212.bugfix
deleted file mode 100644
index ba77217cf..000000000
--- a/changelog.d/6212.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue with mention pill avatar consuming tap gestures
diff --git a/changelog.d/pr-6188.bugfix b/changelog.d/pr-6188.bugfix
deleted file mode 100644
index ead11c389..000000000
--- a/changelog.d/pr-6188.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added attempt at fixing random crashes while calculating timeline cell heights.
\ No newline at end of file
diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change
deleted file mode 100644
index e605774eb..000000000
--- a/changelog.d/x-nolink-0.change
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)).
\ No newline at end of file