diff --git a/.backportrc.json b/.backportrc.json
index 001ba1941..94675147c 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -1,6 +1,6 @@
 {
   "upstream": "elastic/helm-charts",
-  "targetBranchChoices": ["6.8", "7.10", "7.x"],
+  "targetBranchChoices": ["6.8", "7.10", "7.11", "7.x"],
   "all": true,
   "prFilter": "label:need-backport",
   "targetPRLabels": ["backport"],
diff --git a/README.md b/README.md
index e59c77c68..159c4d4eb 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ The `master` version of these charts are intended to support the latest pre-rele
 versions of our products, and therefore may or may not work with current released
 versions.
 
-| Chart                                      | Docker documentation                                                            | Latest 7 Version           | Latest 6 Version            |
-|--------------------------------------------|---------------------------------------------------------------------------------|----------------------------|-----------------------------|
+| Chart                                      | Docker documentation                                                            | Latest 7 Version            | Latest 6 Version            |
+|--------------------------------------------|---------------------------------------------------------------------------------|-----------------------------|-----------------------------|
 | [APM-Server](./apm-server/README.md)       | https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html       | [`7.10.1`][apm-7]           | [`6.8.13`][apm-6]           |
 | [Elasticsearch](./elasticsearch/README.md) | https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html     | [`7.10.1`][elasticsearch-7] | [`6.8.13`][elasticsearch-6] |
 | [Filebeat](./filebeat/README.md)           | https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html   | [`7.10.1`][filebeat-7]      | [`6.8.13`][filebeat-6]      |
@@ -53,19 +53,20 @@ Note that only the released charts coming from [Elastic Helm repo][] or
 
 ### Support Matrix
 
-|     | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
-|-----|---------------|--------|----------|----------|------------|------------|
-| 6.8 | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
-| 7.0 | Alpha         | Alpha  | /        | /        | /          | /          |
-| 7.1 | Beta          | Beta   | /        | Beta     | /          | /          |
-| 7.2 | Beta          | Beta   | /        | Beta     | Beta       | /          |
-| 7.3 | Beta          | Beta   | /        | Beta     | Beta       | /          |
-| 7.4 | Beta          | Beta   | /        | Beta     | Beta       | /          |
-| 7.5 | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
-| 7.6 | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
-| 7.7 | GA            | GA     | Beta     | GA       | GA         | Beta       |
-| 7.8 | GA            | GA     | Beta     | GA       | GA         | Beta       |
-| 7.9 | GA            | GA     | Beta     | GA       | GA         | Beta       |
+|      | Elasticsearch | Kibana | Logstash | Filebeat | Metricbeat | APM Server |
+|------|---------------|--------|----------|----------|------------|------------|
+| 6.8  | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
+| 7.0  | Alpha         | Alpha  | /        | /        | /          | /          |
+| 7.1  | Beta          | Beta   | /        | Beta     | /          | /          |
+| 7.2  | Beta          | Beta   | /        | Beta     | Beta       | /          |
+| 7.3  | Beta          | Beta   | /        | Beta     | Beta       | /          |
+| 7.4  | Beta          | Beta   | /        | Beta     | Beta       | /          |
+| 7.5  | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
+| 7.6  | Beta          | Beta   | Beta     | Beta     | Beta       | Alpha      |
+| 7.7  | GA            | GA     | Beta     | GA       | GA         | Beta       |
+| 7.8  | GA            | GA     | Beta     | GA       | GA         | Beta       |
+| 7.9  | GA            | GA     | Beta     | GA       | GA         | Beta       |
+| 7.10 | GA            | GA     | Beta     | GA       | GA         | Beta       |
 
 ### Kubernetes Versions
 
diff --git a/filebeat/README.md b/filebeat/README.md
index 2b0ffa59a..1249d9e35 100644
--- a/filebeat/README.md
+++ b/filebeat/README.md
@@ -22,6 +22,7 @@ This Helm chart is a lightweight way to configure and run our official
   - [How to use Filebeat with Elasticsearch with security (authentication and TLS) enabled?](#how-to-use-filebeat-with-elasticsearch-with-security-authentication-and-tls-enabled)
   - [How to install OSS version of Filebeat?](#how-to-install-oss-version-of-filebeat)
   - [Why is Filebeat host.name field set to Kubernetes pod name?](#why-is-filebeat-hostname-field-set-to-kubernetes-pod-name)
+  - [How do I get multiple beats agents working with hostNetworking enabled?](#how-do-i-get-multiple-beats-agents-working-with-hostnetworking-enabled)
   - [How to change readinessProbe for outputs which don't support testing](#how-to-change-readinessprobe-for-outputs-which-dont-support-testing)
 - [Contributing](#contributing)
 
@@ -87,6 +88,8 @@ activate it by setting `hostNetworking: true` in [values.yaml][].
 as a reference. They are also used in the automated testing of this chart.
 
 
+## Configuration
+
 | Parameter                      | Description                                                                                                                                                                  | Default                            |
 |--------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|
 | `clusterRoleRules`             | Configurable [cluster role rules][] that Filebeat uses to access Kubernetes resources                                                                                        | see [values.yaml][]                |
@@ -192,9 +195,9 @@ same node.
 
 ### How do I get multiple beats agents working with hostNetworking enabled?
 
-The default http port for multiple beats agents may be on the same port, for 
-example, Filebeats and Metricbeats both default to 5066. When `hostNetworking` 
-is enabled this will cause collisions when standing up the http server. The work 
+The default http port for multiple beats agents may be on the same port, for
+example, Filebeats and Metricbeats both default to 5066. When `hostNetworking`
+is enabled this will cause collisions when standing up the http server. The work
 around for this is to set `http.port` in the config file for one of the beats agent
 to use a different port.