diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3196c1f12a0..f47ef812fd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+<!-- 8.1.7 START -->
+
+# 8.1.7 (2021-10-06)
+
+### Bug fixes
+
+- **Alerting:** Fix alerts with evaluation interval more than 30 seconds resolving before notification. [#39513](https://github.com/grafana/grafana/pull/39513), [@gerobinson](https://github.com/gerobinson)
+- **Elasticsearch/Prometheus:** Fix usage of proper SigV4 service namespace. [#39439](https://github.com/grafana/grafana/pull/39439), [@marefr](https://github.com/marefr)
+
+<!-- 8.1.7 END -->
+
+<!-- 8.1.6 START -->
+
+# 8.1.6 (2021-10-05)
+
+- **Security**: Fixes CVE-2021-39226. For more information, see our [blog](https://grafana.com/blog/2021/10/05/grafana-7.5.11-and-8.1.6-released-with-critical-security-fix/)
+
+<!-- 8.1.6 END -->
+
 <!-- 8.1.5 START -->
 
 # 8.1.5 (2021-09-21)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index 65c6c78053b..c3b52b04a95 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.1.7]({{< relref "release-notes-8-1-7" >}})
 - [Release notes for 8.1.6]({{< relref "release-notes-8-1-6" >}})
 - [Release notes for 8.1.5]({{< relref "release-notes-8-1-5" >}})
 - [Release notes for 8.1.4]({{< relref "release-notes-8-1-4" >}})
diff --git a/docs/sources/release-notes/release-notes-8-1-7.md b/docs/sources/release-notes/release-notes-8-1-7.md
new file mode 100644
index 00000000000..a6b589bf6ec
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-8-1-7.md
@@ -0,0 +1,14 @@
++++
+title = "Release notes for Grafana 8.1.7"
+[_build]
+list = false
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 8.1.7
+
+### Bug fixes
+
+- **Alerting:** Fix alerts with evaluation interval more than 30 seconds resolving before notification. [#39513](https://github.com/grafana/grafana/pull/39513), [@gerobinson](https://github.com/gerobinson)
+- **Elasticsearch/Prometheus:** Fix usage of proper SigV4 service namespace. [#39439](https://github.com/grafana/grafana/pull/39439), [@marefr](https://github.com/marefr)