diff --git a/CHANGES.md b/CHANGES.md
index 9590adc060..7021877ced 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,34 @@
+Changes in Element v1.3.8 (2021-11-17)
+======================================
+
+Features ✨
+----------
+ - Make notification text spoiler aware ([#3477](https://github.com/vector-im/element-android/issues/3477))
+ - Poll Feature - Create Poll Screen (Disabled for now) ([#4367](https://github.com/vector-im/element-android/issues/4367))
+ - Adds support for images inside message notifications ([#4402](https://github.com/vector-im/element-android/issues/4402))
+
+Bugfixes 🐛
+----------
+ - Render markdown in room list ([#452](https://github.com/vector-im/element-android/issues/452))
+ - Fix incorrect cropping of conversation icons ([#4424](https://github.com/vector-im/element-android/issues/4424))
+ - Fix potential NullPointerException crashes in Room and User account data sources ([#4428](https://github.com/vector-im/element-android/issues/4428))
+ - Unable to establish Olm outbound session from fallback key ([#4446](https://github.com/vector-im/element-android/issues/4446))
+ - Fixes intermittent crash on sign out due to the session being incorrectly recreated whilst being closed ([#4480](https://github.com/vector-im/element-android/issues/4480))
+
+SDK API changes ⚠️
+------------------
+ - Add content scanner API from MSC1453
+  API documentation : https://github.com/matrix-org/matrix-content-scanner#api ([#4392](https://github.com/vector-im/element-android/issues/4392))
+ - Breaking SDK API change to PushRuleListener, the separated callbacks have been merged into one with a data class which includes all the previously separated push information ([#4401](https://github.com/vector-im/element-android/issues/4401))
+
+Other changes
+-------------
+ - Finish migration from RxJava to Flow ([#4219](https://github.com/vector-im/element-android/issues/4219))
+ - Remove redundant text in feature request issue form ([#4257](https://github.com/vector-im/element-android/issues/4257))
+ - Add and improve issue triage workflows ([#4435](https://github.com/vector-im/element-android/issues/4435))
+ - Update issue template to bring in line with element-web ([#4452](https://github.com/vector-im/element-android/issues/4452))
+
+
 Changes in Element v1.3.7 (2021-11-04)
 ======================================
 
diff --git a/changelog.d/3477.feature b/changelog.d/3477.feature
deleted file mode 100644
index c6f8820b4c..0000000000
--- a/changelog.d/3477.feature
+++ /dev/null
@@ -1 +0,0 @@
-Make notification text spoiler aware
\ No newline at end of file
diff --git a/changelog.d/4219.misc b/changelog.d/4219.misc
deleted file mode 100644
index 69950e0915..0000000000
--- a/changelog.d/4219.misc
+++ /dev/null
@@ -1 +0,0 @@
-Finish migration from RxJava to Flow
\ No newline at end of file
diff --git a/changelog.d/4257.misc b/changelog.d/4257.misc
deleted file mode 100644
index fa0657bfea..0000000000
--- a/changelog.d/4257.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant text in feature request issue form
diff --git a/changelog.d/4367.feature b/changelog.d/4367.feature
deleted file mode 100644
index c001cc778f..0000000000
--- a/changelog.d/4367.feature
+++ /dev/null
@@ -1 +0,0 @@
-Poll Feature - Create Poll Screen (Disabled for now)
\ No newline at end of file
diff --git a/changelog.d/4392.removal b/changelog.d/4392.removal
deleted file mode 100644
index 42ba81152a..0000000000
--- a/changelog.d/4392.removal
+++ /dev/null
@@ -1,2 +0,0 @@
-Add content scanner API from MSC1453
-API documentation : https://github.com/matrix-org/matrix-content-scanner#api
\ No newline at end of file
diff --git a/changelog.d/4401.removal b/changelog.d/4401.removal
deleted file mode 100644
index ce58372a18..0000000000
--- a/changelog.d/4401.removal
+++ /dev/null
@@ -1 +0,0 @@
-Breaking SDK API change to PushRuleListener, the separated callbacks have been merged into one with a data class which includes all the previously separated push information
diff --git a/changelog.d/4402.feature b/changelog.d/4402.feature
deleted file mode 100644
index 29b9f9a337..0000000000
--- a/changelog.d/4402.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds support for images inside message notifications
\ No newline at end of file
diff --git a/changelog.d/4424.bugfix b/changelog.d/4424.bugfix
deleted file mode 100644
index 679440d204..0000000000
--- a/changelog.d/4424.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect cropping of conversation icons
\ No newline at end of file
diff --git a/changelog.d/4428.bugfix b/changelog.d/4428.bugfix
deleted file mode 100644
index 381f246fee..0000000000
--- a/changelog.d/4428.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix potential NullPointerException crashes in Room and User account data sources
diff --git a/changelog.d/4435.misc b/changelog.d/4435.misc
deleted file mode 100644
index 14e2425d79..0000000000
--- a/changelog.d/4435.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add and improve issue triage workflows
diff --git a/changelog.d/4446.bugfix b/changelog.d/4446.bugfix
deleted file mode 100644
index 140e18a3ba..0000000000
--- a/changelog.d/4446.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Unable to establish Olm outbound session from fallback key
\ No newline at end of file
diff --git a/changelog.d/4452.misc b/changelog.d/4452.misc
deleted file mode 100644
index 10d98c32c3..0000000000
--- a/changelog.d/4452.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update issue template to bring in line with element-web
diff --git a/changelog.d/4480.bugfix b/changelog.d/4480.bugfix
deleted file mode 100644
index 5769fb4efa..0000000000
--- a/changelog.d/4480.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes intermittent crash on sign out due to the session being incorrectly recreated whilst being closed
\ No newline at end of file
diff --git a/changelog.d/452.bugfix b/changelog.d/452.bugfix
deleted file mode 100644
index 6e3d2539b5..0000000000
--- a/changelog.d/452.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Render markdown in room list
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40103070.txt b/fastlane/metadata/android/en-US/changelogs/40103070.txt
index ad225133c2..9a7030728a 100644
--- a/fastlane/metadata/android/en-US/changelogs/40103070.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40103070.txt
@@ -1,2 +1,2 @@
 Main changes in this version: Bug fixes mainly regarding the notifications.
-Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.7
\ No newline at end of file
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.7-RC2
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40103080.txt b/fastlane/metadata/android/en-US/changelogs/40103080.txt
new file mode 100644
index 0000000000..fc00c5da9e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40103080.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.8
\ No newline at end of file