diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78d4463d39b..2bba285b109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<!-- 8.2.4 START -->
+
+# 8.2.4 (2021-11-15)
+
+- **Security**: Fixes CVE-2021-41244. For more information, see our [blog](https://grafana.com/blog/2021/11/15/grafana-8.2.4-released-with-security-fixes/)
+
+<!-- 8.2.4 END -->
+
 <!-- 8.2.3 START -->
 
 # 8.2.3 (2021-11-03)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index ea1df07ad1f..cae401c6232 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -8,6 +8,7 @@ weight = 10000
 Here you can find detailed release notes that list everything that is included in every release as well as notices
 about deprecations, breaking changes as well as changes that relate to plugin development.
 
+- [Release notes for 8.2.4]({{< relref "release-notes-8-2-4" >}})
 - [Release notes for 8.2.3]({{< relref "release-notes-8-2-3" >}})
 - [Release notes for 8.2.2]({{< relref "release-notes-8-2-2" >}})
 - [Release notes for 8.2.1]({{< relref "release-notes-8-2-1" >}})
diff --git a/docs/sources/release-notes/release-notes-8-2-4.md b/docs/sources/release-notes/release-notes-8-2-4.md
new file mode 100644
index 00000000000..ed9600f1d1c
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-8-2-4.md
@@ -0,0 +1,13 @@
++++
+title = "Release notes for Grafana 8.2.4"
+[_build]
+list = false
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 8.2.4
+
+### Bug fixes
+
+- **Security**: Fixes CVE-2021-41244. For more information, see our [blog](https://grafana.com/blog/2021/11/15/grafana-8.2.4-released-with-security-fixes/)