diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae54692f882886581a2cb08426eeed5918176b14..084eb7381ca45af681437ceadba2b679ccf13845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.1.16
+
+### Security (2 changes)
+
+- Sanitize search text to prevent XSS.
+- Fix stored XSS issue for grafana_url.
+
+
 ## 12.1.15
 
 - Unreleased due to build failures
diff --git a/changelogs/unreleased/security-stored-xss-using-find-file.yml b/changelogs/unreleased/security-stored-xss-using-find-file.yml
deleted file mode 100644
index 41cd2f9494ffc16ada0ee8b797d7b020369ec655..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/security-stored-xss-using-find-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sanitize search text to prevent XSS
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-xss-grafana-url-12-4.yml b/changelogs/unreleased/security-xss-grafana-url-12-4.yml
deleted file mode 100644
index d0adff94b762827a9f6bd4efb20f031c1f75d4bd..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/security-xss-grafana-url-12-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix stored XSS issue for grafana_url
-merge_request:
-author:
-type: security