diff --git a/CHANGELOG.md b/CHANGELOG.md
index d25e11c104f..4b6eaaac0f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -479,6 +479,17 @@ In the Loki data source, for consistency and performance reasons, we changed how
 
 The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559)
 
+<!-- 8.5.6 START -->
+
+# 8.5.6 (2022-06-14)
+
+### Bug fixes
+
+- **Dashboard:** Fixes random scrolling on time range change. [#50379](https://github.com/grafana/grafana/pull/50379), [@torkelo](https://github.com/torkelo)
+- **Security:** Fixes minor code scanning security warnings in old vendored javascript libs. [#50382](https://github.com/grafana/grafana/pull/50382), [@torkelo](https://github.com/torkelo)
+
+<!-- 8.5.6 END -->
+
 <!-- 8.5.5 START -->
 
 # 8.5.5 (2022-06-06)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index ede831dba9c..c4d198459f6 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -14,6 +14,7 @@ about deprecations, breaking changes as well as changes that relate to plugin de
 - [Release notes for 9.0.0-beta3]({{< relref "release-notes-9-0-0-beta3" >}})
 - [Release notes for 9.0.0-beta2]({{< relref "release-notes-9-0-0-beta2/" >}})
 - [Release notes for 9.0.0-beta1]({{< relref "release-notes-9-0-0-beta1/" >}})
+- [Release notes for 8.5.6]({{< relref "release-notes-8-5-6" >}})
 - [Release notes for 8.5.5]({{< relref "release-notes-8-5-5" >}})
 - [Release notes for 8.5.4]({{< relref "release-notes-8-5-4/" >}})
 - [Release notes for 8.5.3]({{< relref "release-notes-8-5-3/" >}})
diff --git a/docs/sources/release-notes/release-notes-8-5-6.md b/docs/sources/release-notes/release-notes-8-5-6.md
new file mode 100644
index 00000000000..f21b5222524
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-8-5-6.md
@@ -0,0 +1,13 @@
++++
+title = "Release notes for Grafana 8.5.6"
+hide_menu = true
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 8.5.6
+
+### Bug fixes
+
+- **Dashboard:** Fixes random scrolling on time range change. [#50379](https://github.com/grafana/grafana/pull/50379), [@torkelo](https://github.com/torkelo)
+- **Security:** Fixes minor code scanning security warnings in old vendored javascript libs. [#50382](https://github.com/grafana/grafana/pull/50382), [@torkelo](https://github.com/torkelo)