diff --git a/CHANGELOG.md b/CHANGELOG.md
index d78ce51d4d9..8c5616aa7dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,17 @@ With this feature, you can specify the local time zone of the service or system
 
 We have also extended the time zone options so you can select any of the standard [ISO 8601 time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
 
+# 7.0.0-beta3 (2020-05-08)
+
+### Features / Enhancements
+* **Docker**: Upgrade to Alpine 3.11. [#24056](https://github.com/grafana/grafana/pull/24056), [@aknuds1](https://github.com/aknuds1)
+* **Forms**: Remove Forms namespace [BREAKING]. Will cause all `Forms` imports to stop working. See migration guide in [@grafana/ui changelog](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/CHANGELOG.md)[#24378](https://github.com/grafana/grafana/pull/24378), [@tskarhed](https://github.com/tskarhed)
+
+### Bug Fixes
+* **CloudWatch**: Fix error with expression only query. [#24362](https://github.com/grafana/grafana/pull/24362), [@aocenas](https://github.com/aocenas)
+* **Elasticsearch**: Fix building of raw document queries resulting in error Unknown BaseAggregationBuilder error. [#24403](https://github.com/grafana/grafana/pull/24403), [@ivanahuckova](https://github.com/ivanahuckova)
+* **Prometheus**: Fix for prometheus legend formats for instant time series queries. [#24407](https://github.com/grafana/grafana/pull/24407), [@torkelo](https://github.com/torkelo)
+
 # 7.0.0-beta2 (2020-05-07)
 
 ## Breaking changes
diff --git a/packages/grafana-ui/CHANGELOG.md b/packages/grafana-ui/CHANGELOG.md
index abdb78dac00..9a7d61c2d5b 100644
--- a/packages/grafana-ui/CHANGELOG.md
+++ b/packages/grafana-ui/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 7.0.0-beta3 (2020-05-08)
+
+### Features / Enhancements
+* **Forms**: Remove Forms namespace [BREAKING]. Will cause all `Forms` imports to stop working. See migration guide below. [#24378](https://github.com/grafana/grafana/pull/24378), [@tskarhed](https://github.com/tskarhed)
+
 # 7.0.0-beta.2 (2020-05-07)
 
 ### Bug Fixes
@@ -92,4 +97,3 @@ Version update to 6.0.0 to keep @grafana/ui version in sync with [Grafana](https
 
 # 1.0.0-alpha.0 (2019-02-21)
 First public release
-