diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
index b3781fc50..862bff91b 100644
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -3,31 +3,32 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 
-- [7.9.0 - 2020/08/18](#790---20200818)
-- [6.8.12 - 2020/08/18](#6812---20200818)
-- [7.8.1 - 2020/07/28](#781---20200728)
+  - [7.9.0 - 2020/08/18](#790---20200818)
+    - [Add Helm 3 support in beta](#add-helm-3-support-in-beta)
+  - [6.8.12 - 2020/08/18](#6812---20200818)
+  - [7.8.1 - 2020/07/28](#781---20200728)
     - [Add headless Service for StatefulSet](#add-headless-service-for-statefulset)
-- [6.8.11 - 2020/07/28](#6811---20200728)
+  - [6.8.11 - 2020/07/28](#6811---20200728)
 - [7.8.0 - 2020/06/18](#780---20200618)
     - [Stable Elasticsearch deprecated](#stable-elasticsearch-deprecated)
     - [APM Server memory limit](#apm-server-memory-limit)
     - [Elasticsearch service selector change](#elasticsearch-service-selector-change)
-- [7.7.0 - 2020/05/13](#770---20200513)
-  - [Known Issues](#known-issues)
-  - [GA support](#ga-support)
-  - [New branching model](#new-branching-model)
-  - [Filebeat container inputs](#filebeat-container-inputs)
-  - [Metricbeat upgrade issue](#metricbeat-upgrade-issue)
-  - [Metricbeat split values for daemonset and deployment](#metricbeat-split-values-for-daemonset-and-deployment)
-- [6.8.9 - 2020/05/13](#689---20200513)
-- [7.6.2 - 2020/03/31](#762---20200331)
-  - [Kibana default resources](#kibana-default-resources)
-- [7.6.0 - 2020/02/11](#760---20200211)
-  - [Elasticsearch default resources](#elasticsearch-default-resources)
-- [7.5.0 - 2019/12/02](#750---20191202)
-  - [Metricbeat kube-state-metrics upgrade](#metricbeat-kube-state-metrics-upgrade)
-- [7.0.0-alpha1 - 2019/04/17](#700-alpha1---20190417)
-  - [Elasticsearch upgrade from 6.x](#elasticsearch-upgrade-from-6x)
+  - [7.7.0 - 2020/05/13](#770---20200513)
+    - [Known Issues](#known-issues)
+    - [GA support](#ga-support)
+    - [New branching model](#new-branching-model)
+    - [Filebeat container inputs](#filebeat-container-inputs)
+    - [Metricbeat upgrade issue](#metricbeat-upgrade-issue)
+    - [Metricbeat split values for daemonset and deployment](#metricbeat-split-values-for-daemonset-and-deployment)
+  - [6.8.9 - 2020/05/13](#689---20200513)
+  - [7.6.2 - 2020/03/31](#762---20200331)
+    - [Kibana default resources](#kibana-default-resources)
+  - [7.6.0 - 2020/02/11](#760---20200211)
+    - [Elasticsearch default resources](#elasticsearch-default-resources)
+  - [7.5.0 - 2019/12/02](#750---20191202)
+    - [Metricbeat kube-state-metrics upgrade](#metricbeat-kube-state-metrics-upgrade)
+  - [7.0.0-alpha1 - 2019/04/17](#700-alpha1---20190417)
+    - [Elasticsearch upgrade from 6.x](#elasticsearch-upgrade-from-6x)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- Use this to update TOC: -->
@@ -36,6 +37,13 @@
 
 ## 7.9.0 - 2020/08/18
 
+### Add Helm 3 support in beta
+
+Starting with 7.9.0, all the main blockers for Helm 3 are fixed. While automated
+CI tests are not updated to use Helm 3 yet, deploying these charts Helm 3 with
+Helm 3 is now supported in beta.
+
+
 ## 6.8.12 - 2020/08/18
 
 See [7.9.0 Breaking changes](#790---20200818)
@@ -54,6 +62,12 @@ requirement and fails if `serviceName` is missing.
 Upgrading the Logstash chart from a previous version will require using
 `helm upgrade --force`.
 
+**Edit:** This change introduced a bug when using `extraPorts` value ([#765][]).
+This will be fixed by [#766][] with 7.9.1 (and 6.8.13) release.
+
+Meanwhile, you should rollback to 7.8.0 (or 6.8.10) release of Logstash chart if
+you are using some custom `extraPorts` value.
+
 
 ## 6.8.11 - 2020/07/28
 
@@ -258,6 +272,8 @@ volumeClaimTemplate:
 [#623]: https://github.com/elastic/helm-charts/pull/623
 [#664]: https://github.com/elastic/helm-charts/pull/664
 [#695]: https://github.com/elastic/helm-charts/pull/695
+[#765]: https://github.com/elastic/helm-charts/issues/765
+[#766]: https://github.com/elastic/helm-charts/issues/766
 [container input]: https://www.elastic.co/guide/en/beats/filebeat/7.7/filebeat-input-container.html
 [docker input]: https://www.elastic.co/guide/en/beats/filebeat/7.7/filebeat-input-docker.html
 [elastic elasticsearch chart]: https://github.com/elastic/helm-charts/tree/master/elasticsearch
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 648795dbe..690814b99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,17 +109,21 @@
 
 ## 7.9.0 - 2020/08/18
 * 7.9.0 as the default stack version
+* Add Helm 3 support in beta ([@jmlrt](https://github.com/jmlrt))
+* Some improvements in CI tests jobs ([@jmlrt](https://github.com/jmlrt))
+
 
 ## 6.8.12 - 2020/08/18
 
 * 6.8.12 as the default stack version
 * See [7.9.0 CHANGELOG](#790---20200818) for other changes
 
+
 ## 7.8.1 - 2020/07/28
 
 * 7.8.1 as the default stack version
 * Some documentation fixes and improvements ([@ArthurFritz](https://github.com/ArthurFritz), [@fatmcgav](https://github.com/fatmcgav) and [AhmedSamirAhmed](https://github.com/AhmedSamirAhmed))
-* Some improvements in CI tests jobs in ([@jmlrt](https://github.com/jmlrt)) and [@fatmcgav](https://github.com/fatmcgav))
+* Some improvements in CI tests jobs ([@jmlrt](https://github.com/jmlrt)) and [@fatmcgav](https://github.com/fatmcgav))
 
 ### APM Server