diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c2ab6bf553d2402cf561987e57067565cc08a1..1ccc566981757ee008d9a20b7f8443991fa7eae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.9.4 (2020-04-16)
+
+### Fixed (5 changes, 1 of them is from the community)
+
+- Fix not working File upload from Project overview page. !26828 (Gilang Gumilar)
+- Fix storage rollback regression caused by previous refactor. !28496
+- Fix incorrect regex used in FileUploader#extract_dynamic_path. !28683
+- Fully qualify id columns for keyset pagination (Projects API). !29026
+- Fix Slack notifications when upgrading from old GitLab versions. !29111
+
+
 ## 12.9.3 (2020-04-14)
 
 ### Security (3 changes)
diff --git a/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml b/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml
deleted file mode 100644
index 92675668950c8fcf2ad947e4537b78f569252f8a..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/209059-fix-project-show-file-upload-not-working.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix not working File upload from Project overview page.
-merge_request: 26828
-author: Gilang Gumilar
-type: fixed
diff --git a/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml b/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml
deleted file mode 100644
index 521fc9f83b7edbcaeb9927fdb7f09b4c16d60351..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix incorrect regex used in FileUploader#extract_dynamic_path
-merge_request: 28683
-author:
-type: fixed
diff --git a/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml b/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml
deleted file mode 100644
index 73955b4c2c31427434d9331f44fcabb0aa158032..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/211452-rollback_to_legacy-causes-repos-to-404.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix storage rollback regression caused by previous refactor
-merge_request: 28496
-author:
-type: fixed
diff --git a/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml b/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml
deleted file mode 100644
index 3814ed9476a195b58b0cffb320c99212e60d3787..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/212073-slack-notifications-stop-working-after-updating-gitlab.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Slack notifications when upgrading from old GitLab versions
-merge_request: 29111
-author:
-type: fixed
diff --git a/changelogs/unreleased/ab-keyset-ambig-bug.yml b/changelogs/unreleased/ab-keyset-ambig-bug.yml
deleted file mode 100644
index b41117946711308ebafaa197e7ec230808f6b4b6..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/ab-keyset-ambig-bug.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fully qualify id columns for keyset pagination (Projects API)
-merge_request: 29026
-author:
-type: fixed