diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml
index e3f8d9cf5..d5598f916 100755
--- a/apm-server/Chart.yaml
+++ b/apm-server/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: apm-server
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/apm
 icon: https://helm.elastic.co/icons/apm.png
diff --git a/apm-server/README.md b/apm-server/README.md
index cdac292c9..69072c5ee 100644
--- a/apm-server/README.md
+++ b/apm-server/README.md
@@ -11,7 +11,6 @@ provided as-is with no warranties. Alpha features are not subject to the support
 SLA of official GA features (see [supported configurations][] for more details).
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -44,7 +43,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -62,8 +61,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 * Checkout the branch : `git checkout 7.16`
 
 * Install it:
-  - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -102,7 +101,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `hostAliases`               | Configurable [hostAliases][]                                                                                                                               | `[]`                               |
 | `imagePullPolicy`           | The Kubernetes [imagePullPolicy][] value                                                                                                                   | `IfNotPresent`                     |
 | `imagePullSecrets`          | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                               | `[]`                               |
-| `imageTag`                  | The APM Server Docker image tag                                                                                                                            | `7.16.3-SNAPSHOT`                           |
+| `imageTag`                  | The APM Server Docker image tag                                                                                                                            | `7.16.3`                           |
 | `image`                     | The APM Server Docker image                                                                                                                                | `docker.elastic.co/apm/apm-server` |
 | `ingress`                   | Configurable [ingress][] to expose the APM Server service                                                                                                  | see [values.yaml][]                |
 | `labels`                    | Configurable [labels][] applied to all APM server pods                                                                                                     | `{}`                               |
diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md
index cfbdd2ad3..0d3601c11 100644
--- a/apm-server/examples/default/README.md
+++ b/apm-server/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy APM Server 7.16.3-SNAPSHOT using [default values][].
+This example deploy APM Server 7.16.3 using [default values][].
 
 
 ## Usage
diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md
index 109d8c7ec..dc7a304e9 100644
--- a/apm-server/examples/oss/README.md
+++ b/apm-server/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy APM Server 7.16.3-SNAPSHOT using [APM Server OSS][] version.
+This example deploy APM Server 7.16.3 using [APM Server OSS][] version.
 
 
 ## Usage
diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md
index 870699534..57bdd7802 100644
--- a/apm-server/examples/security/README.md
+++ b/apm-server/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy APM Server 7.16.3-SNAPSHOT using authentication and TLS to connect to
+This example deploy APM Server 7.16.3 using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/apm-server/values.yaml b/apm-server/values.yaml
index ac0af89a4..c12e96d43 100755
--- a/apm-server/values.yaml
+++ b/apm-server/values.yaml
@@ -71,7 +71,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/apm/apm-server"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index ba8fe70a1..4e3bef8de 100755
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: elasticsearch
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/elasticsearch
 icon: https://helm.elastic.co/icons/elasticsearch.png
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
index cf7e94c97..a39f10344 100644
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official
 [Elasticsearch Docker image][].
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -53,7 +52,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -71,8 +70,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 * Checkout the branch : `git checkout 7.16`
 
 * Install it:
-  - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -132,7 +131,7 @@ support multiple versions with minimal changes.
 | `httpPort`                         | The http port that Kubernetes will use for the healthchecks and the service. If you change this you will also need to set [http.port][] in `extraEnvs`                                                                                                                                                            | `9200`                                           |
 | `imagePullPolicy`                  | The Kubernetes [imagePullPolicy][] value                                                                                                                                                                                                                                                                          | `IfNotPresent`                                   |
 | `imagePullSecrets`                 | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                                                                                                                                                      | `[]`                                             |
-| `imageTag`                         | The Elasticsearch Docker image tag                                                                                                                                                                                                                                                                                | `7.16.3-SNAPSHOT`                                         |
+| `imageTag`                         | The Elasticsearch Docker image tag                                                                                                                                                                                                                                                                                | `7.16.3`                                         |
 | `image`                            | The Elasticsearch Docker image                                                                                                                                                                                                                                                                                    | `docker.elastic.co/elasticsearch/elasticsearch`  |
 | `ingress`                          | Configurable [ingress][] to expose the Elasticsearch service. See [values.yaml][] for an example                                                                                                                                                                                                                  | see [values.yaml][]                              |
 | `initResources`                    | Allows you to set the [resources][] for the `initContainer` in the StatefulSet                                                                                                                                                                                                                                    | `{}`                                             |
diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md
index e178f4fa7..07dd6ac23 100644
--- a/elasticsearch/examples/config/README.md
+++ b/elasticsearch/examples/config/README.md
@@ -1,6 +1,6 @@
 # Config
 
-This example deploy a single node Elasticsearch 7.16.3-SNAPSHOT with authentication and
+This example deploy a single node Elasticsearch 7.16.3 with authentication and
 custom [values][].
 
 
diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md
index 7a6b71e8d..782501a12 100644
--- a/elasticsearch/examples/default/README.md
+++ b/elasticsearch/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster using
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster using
 [default values][].
 
 
diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
index 3d5b1f337..0f8d97adc 100644
--- a/elasticsearch/examples/default/test/goss.yaml
+++ b/elasticsearch/examples/default/test/goss.yaml
@@ -15,7 +15,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.16.3-SNAPSHOT"'
+      - '"number" : "7.16.3"'
       - '"cluster_name" : "elasticsearch"'
       - "You Know, for Search"
 
diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md
index 8297503d2..3e41d834d 100644
--- a/elasticsearch/examples/docker-for-mac/README.md
+++ b/elasticsearch/examples/docker-for-mac/README.md
@@ -1,6 +1,6 @@
 # Docker for Mac
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster on [Docker for Mac][]
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster on [Docker for Mac][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended
diff --git a/elasticsearch/examples/kubernetes-kind/README.md b/elasticsearch/examples/kubernetes-kind/README.md
index 4020f3414..62daa83aa 100644
--- a/elasticsearch/examples/kubernetes-kind/README.md
+++ b/elasticsearch/examples/kubernetes-kind/README.md
@@ -1,6 +1,6 @@
 # KIND
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster on [Kind][]
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster on [Kind][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended
diff --git a/elasticsearch/examples/microk8s/README.md b/elasticsearch/examples/microk8s/README.md
index 32701a6bf..4ada60421 100644
--- a/elasticsearch/examples/microk8s/README.md
+++ b/elasticsearch/examples/microk8s/README.md
@@ -1,6 +1,6 @@
 # MicroK8S
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster on [MicroK8S][]
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster on [MicroK8S][]
 using [custom values][].
 
 Note that this configuration should be used for test only and isn't recommended
diff --git a/elasticsearch/examples/minikube/README.md b/elasticsearch/examples/minikube/README.md
index f6a00c018..2134b1063 100644
--- a/elasticsearch/examples/minikube/README.md
+++ b/elasticsearch/examples/minikube/README.md
@@ -1,6 +1,6 @@
 # Minikube
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster on [Minikube][]
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster on [Minikube][]
 using [custom values][].
 
 If helm or kubectl timeouts occur, you may consider creating a minikube VM with
diff --git a/elasticsearch/examples/multi/README.md b/elasticsearch/examples/multi/README.md
index 3566dfe9c..6fa438995 100644
--- a/elasticsearch/examples/multi/README.md
+++ b/elasticsearch/examples/multi/README.md
@@ -1,6 +1,6 @@
 # Multi
 
-This example deploy an Elasticsearch 7.16.3-SNAPSHOT cluster composed of 3 different Helm
+This example deploy an Elasticsearch 7.16.3 cluster composed of 3 different Helm
 releases:
 
 - `helm-es-multi-master` for the 3 master nodes using [master values][]
diff --git a/elasticsearch/examples/openshift/README.md b/elasticsearch/examples/openshift/README.md
index 5f2fdb973..588e1fe59 100644
--- a/elasticsearch/examples/openshift/README.md
+++ b/elasticsearch/examples/openshift/README.md
@@ -1,6 +1,6 @@
 # OpenShift
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT cluster on [OpenShift][]
+This example deploy a 3 nodes Elasticsearch 7.16.3 cluster on [OpenShift][]
 using [custom values][].
 
 ## Usage
diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
index d1e77c539..5b2ecdfec 100644
--- a/elasticsearch/examples/openshift/test/goss.yaml
+++ b/elasticsearch/examples/openshift/test/goss.yaml
@@ -11,6 +11,6 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.16.3-SNAPSHOT"'
+      - '"number" : "7.16.3"'
       - '"cluster_name" : "elasticsearch"'
       - "You Know, for Search"
diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md
index 28bc5d7bd..4895f0bad 100644
--- a/elasticsearch/examples/security/README.md
+++ b/elasticsearch/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy a 3 nodes Elasticsearch 7.16.3-SNAPSHOT with authentication and
+This example deploy a 3 nodes Elasticsearch 7.16.3 with authentication and
 autogenerated certificates for TLS (see [values][]).
 
 Note that this configuration should be used for test only. For a production
diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml
index 302ab2801..7d38fe97a 100644
--- a/elasticsearch/examples/upgrade/test/goss.yaml
+++ b/elasticsearch/examples/upgrade/test/goss.yaml
@@ -11,6 +11,6 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "7.16.3-SNAPSHOT"'
+      - '"number" : "7.16.3"'
       - '"cluster_name" : "upgrade"'
       - "You Know, for Search"
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 420bf46f0..9e85df8b5 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -65,7 +65,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/elasticsearch/elasticsearch"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 
 podAnnotations:
diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
index a9eb3ab34..88e77b398 100755
--- a/filebeat/Chart.yaml
+++ b/filebeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: filebeat
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/beats
 icon: https://helm.elastic.co/icons/beats.png
diff --git a/filebeat/README.md b/filebeat/README.md
index f88a44850..e1ed47b11 100644
--- a/filebeat/README.md
+++ b/filebeat/README.md
@@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official
 [Filebeat Docker image][].
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -43,7 +42,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -60,8 +59,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 
 * Checkout the branch : `git checkout 7.16`
 * Install it:
-  - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -136,7 +135,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `hostPathRoot`                 | Fully-qualified [hostPath][] that will be used to persist filebeat registry data                                                                                             | `/var/lib`                         |
 | `imagePullPolicy`              | The Kubernetes [imagePullPolicy][] value                                                                                                                                     | `IfNotPresent`                     |
 | `imagePullSecrets`             | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                 | `[]`                               |
-| `imageTag`                     | The filebeat Docker image tag                                                                                                                                                | `7.16.3-SNAPSHOT`                           |
+| `imageTag`                     | The filebeat Docker image tag                                                                                                                                                | `7.16.3`                           |
 | `image`                        | The filebeat Docker image                                                                                                                                                    | `docker.elastic.co/beats/filebeat` |
 | `livenessProbe`                | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds                                                                                   | see [values.yaml][]                |
 | `managedServiceAccount`        | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles                         | `true`                             |
diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md
index 5334f0366..6048d55b4 100644
--- a/filebeat/examples/default/README.md
+++ b/filebeat/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 7.16.3-SNAPSHOT using [default values][].
+This example deploy Filebeat 7.16.3 using [default values][].
 
 
 ## Usage
diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md
index 2c4f74add..5ebd60b67 100644
--- a/filebeat/examples/deployment/README.md
+++ b/filebeat/examples/deployment/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 7.16.3-SNAPSHOT using [default values][] as a Kubernetes Deployment.
+This example deploy Filebeat 7.16.3 using [default values][] as a Kubernetes Deployment.
 
 
 ## Usage
diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md
index 93dbd0707..c59892ded 100644
--- a/filebeat/examples/oss/README.md
+++ b/filebeat/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Filebeat 7.16.3-SNAPSHOT using [Filebeat OSS][] version.
+This example deploy Filebeat 7.16.3 using [Filebeat OSS][] version.
 
 
 ## Usage
diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md
index 0ec6663fa..c46f68c65 100644
--- a/filebeat/examples/security/README.md
+++ b/filebeat/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Filebeat 7.16.3-SNAPSHOT using authentication and TLS to connect to
+This example deploy Filebeat 7.16.3 using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/filebeat/values.yaml b/filebeat/values.yaml
index 091b22433..d2f77f0e7 100755
--- a/filebeat/values.yaml
+++ b/filebeat/values.yaml
@@ -148,7 +148,7 @@ hostAliases: []
 #  - "foo.local"
 #  - "bar.local"
 image: "docker.elastic.co/beats/filebeat"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/helpers/examples.mk b/helpers/examples.mk
index fba7067b0..b9b50341f 100644
--- a/helpers/examples.mk
+++ b/helpers/examples.mk
@@ -2,7 +2,7 @@ SHELL := /bin/bash
 GOSS_VERSION := v0.3.6
 GOSS_FILE ?= goss.yaml
 GOSS_SELECTOR ?= release=$(RELEASE)
-STACK_VERSION := 7.16.3-SNAPSHOT
+STACK_VERSION := 7.16.3
 TIMEOUT := 900s
 
 .PHONY: help
diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index fa08ec607..f08cd2503 100755
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: kibana
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/kibana
 icon: https://helm.elastic.co/icons/kibana.png
diff --git a/kibana/README.md b/kibana/README.md
index 333ec7d34..952b8a50c 100644
--- a/kibana/README.md
+++ b/kibana/README.md
@@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official
 [Kibana Docker image][].
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -40,7 +39,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -58,8 +57,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 * Checkout the branch : `git checkout 7.16`
 
 * Install it:
-  - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -96,7 +95,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `httpPort`            | The http port that Kubernetes will use for the healthchecks and the service                                                                                                                    | `5601`                             |
 | `imagePullPolicy`     | The Kubernetes [imagePullPolicy][]value                                                                                                                                                        | `IfNotPresent`                     |
 | `imagePullSecrets`    | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                                   | `[]`                               |
-| `imageTag`            | The Kibana Docker image tag                                                                                                                                                                    | `7.16.3-SNAPSHOT`                           |
+| `imageTag`            | The Kibana Docker image tag                                                                                                                                                                    | `7.16.3`                           |
 | `image`               | The Kibana Docker image                                                                                                                                                                        | `docker.elastic.co/kibana/kibana`  |
 | `ingress`             | Configurable [ingress][] to expose the Kibana service.                                                                                                                                         | see [values.yaml][]                |
 | `kibanaConfig`        | Allows you to add any config files in `/usr/share/kibana/config/` such as `kibana.yml` See [values.yaml][] for an example of the formatting                                                    | `{}`                               |
diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md
index 694b5b3f2..aa55db4b8 100644
--- a/kibana/examples/default/README.md
+++ b/kibana/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Kibana 7.16.3-SNAPSHOT using [default values][].
+This example deploy Kibana 7.16.3 using [default values][].
 
 
 ## Usage
diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md
index b22555f56..790285e0e 100644
--- a/kibana/examples/openshift/README.md
+++ b/kibana/examples/openshift/README.md
@@ -1,6 +1,6 @@
 # OpenShift
 
-This example deploy Kibana 7.16.3-SNAPSHOT on [OpenShift][] using [custom values][].
+This example deploy Kibana 7.16.3 on [OpenShift][] using [custom values][].
 
 ## Usage
 
diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md
index 693d9f69b..6c33efdf6 100644
--- a/kibana/examples/security/README.md
+++ b/kibana/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Kibana 7.16.3-SNAPSHOT using authentication and TLS to connect to
+This example deploy Kibana 7.16.3 using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/kibana/values.yaml b/kibana/values.yaml
index a9f6d3416..483011ecc 100755
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -35,7 +35,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/kibana/kibana"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 
 # additionals labels
diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml
index 4d8b7337a..03c4867d0 100755
--- a/logstash/Chart.yaml
+++ b/logstash/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: logstash
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/logstash
 icon: https://helm.elastic.co/icons/logstash.png
diff --git a/logstash/README.md b/logstash/README.md
index df486d1b7..ffa6b54c6 100644
--- a/logstash/README.md
+++ b/logstash/README.md
@@ -11,7 +11,6 @@ provided as-is with no warranties. Alpha features are not subject to the support
 SLA of official GA features (see [supported configurations][] for more details).
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -44,7 +43,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -62,8 +61,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 * Checkout the branch : `git checkout 7.16`
 
 * Install it:
-  - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -120,7 +119,7 @@ useful for the [http input plugin][], for instance.
 | `httpPort`                | The http port that Kubernetes will use for the healthchecks and the service                                                                                                                                                          | `9600`                                |
 | `imagePullPolicy`         | The Kubernetes [imagePullPolicy][] value                                                                                                                                                                                             | `IfNotPresent`                        |
 | `imagePullSecrets`        | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                                                                         | `[]`                                  |
-| `imageTag`                | The Logstash Docker image tag                                                                                                                                                                                                        | `7.16.3-SNAPSHOT`                              |
+| `imageTag`                | The Logstash Docker image tag                                                                                                                                                                                                        | `7.16.3`                              |
 | `image`                   | The Logstash Docker image                                                                                                                                                                                                            | `docker.elastic.co/logstash/logstash` |
 | `labels`                  | Configurable [labels][] applied to all Logstash pods                                                                                                                                                                                 | `{}`                                  |
 | `ingress`                 | Configurable [ingress][] for external access to Logstash HTTP port.                                                                                                                                                                  | see [values.yaml][]                   |
diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md
index b1963a263..b4e3fe309 100644
--- a/logstash/examples/default/README.md
+++ b/logstash/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Logstash 7.16.3-SNAPSHOT using [default values][].
+This example deploy Logstash 7.16.3 using [default values][].
 
 
 ## Usage
diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md
index 036a42da7..5b9494b05 100644
--- a/logstash/examples/elasticsearch/README.md
+++ b/logstash/examples/elasticsearch/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch
 
-This example deploy Logstash 7.16.3-SNAPSHOT which connects to Elasticsearch (see
+This example deploy Logstash 7.16.3 which connects to Elasticsearch (see
 [values][]).
 
 
diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md
index f32f260d6..e570f87e0 100644
--- a/logstash/examples/oss/README.md
+++ b/logstash/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Logstash 7.16.3-SNAPSHOT using [Logstash OSS][] version.
+This example deploy Logstash 7.16.3 using [Logstash OSS][] version.
 
 
 ## Usage
diff --git a/logstash/values.yaml b/logstash/values.yaml
index 87aeebaaf..973390ed4 100755
--- a/logstash/values.yaml
+++ b/logstash/values.yaml
@@ -71,7 +71,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/logstash/logstash"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml
index 8dd9d9f4f..96a25a485 100755
--- a/metricbeat/Chart.yaml
+++ b/metricbeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: metricbeat
-version: 7.16.3-SNAPSHOT
-appVersion: 7.16.3-SNAPSHOT
+version: 7.16.3
+appVersion: 7.16.3
 sources:
   - https://github.com/elastic/beats
 icon: https://helm.elastic.co/icons/beats.png
diff --git a/metricbeat/README.md b/metricbeat/README.md
index 507174908..6ce77c15b 100644
--- a/metricbeat/README.md
+++ b/metricbeat/README.md
@@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official
 [Metricbeat Docker image][].
 
 <!-- development warning placeholder -->
-**Warning**: This branch is used for development, please use the latest [7.x][] release for released version.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -41,7 +40,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 7.16.3-SNAPSHOT version.
+This chart is tested with the latest 7.16.3 version.
 
 ### Install released version using Helm repository
 
@@ -60,8 +59,8 @@ This chart is tested with the latest 7.16.3-SNAPSHOT version.
 * Checkout the branch : `git checkout 7.16`
 
 * Install it:
-  - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.16.3-SNAPSHOT`
-  - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.16.3-SNAPSHOT`
+  - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=7.16.3`
+  - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=7.16.3`
 
 
 ## Upgrading
@@ -131,7 +130,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `hostPathRoot`                 | Fully-qualified [hostPath][] that will be used to persist Metricbeat registry data                                                                                           | `/var/lib`                           |
 | `imagePullPolicy`              | The Kubernetes [imagePullPolicy][] value                                                                                                                                     | `IfNotPresent`                       |
 | `imagePullSecrets`             | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                 | `[]`                                 |
-| `imageTag`                     | The Metricbeat Docker image tag                                                                                                                                              | `7.16.3-SNAPSHOT`                             |
+| `imageTag`                     | The Metricbeat Docker image tag                                                                                                                                              | `7.16.3`                             |
 | `image`                        | The Metricbeat Docker image                                                                                                                                                  | `docker.elastic.co/beats/metricbeat` |
 | `kube_state_metrics.enabled`   | Install [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) as a dependency                                                           | `true`                               |
 | `kube_state_metrics.host`      | Define kube-state-metrics endpoint for an existing deployment. Works only if `kube_state_metrics.enabled: false`                                                             | `""`                                 |
diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md
index fba25fea5..6014cc94e 100644
--- a/metricbeat/examples/default/README.md
+++ b/metricbeat/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Metricbeat 7.16.3-SNAPSHOT using [default values][].
+This example deploy Metricbeat 7.16.3 using [default values][].
 
 
 ## Usage
diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md
index 6e9453ee8..42ff08185 100644
--- a/metricbeat/examples/oss/README.md
+++ b/metricbeat/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Metricbeat 7.16.3-SNAPSHOT using [Metricbeat OSS][] version.
+This example deploy Metricbeat 7.16.3 using [Metricbeat OSS][] version.
 
 
 ## Usage
diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md
index d655bc9d9..6fc507560 100644
--- a/metricbeat/examples/security/README.md
+++ b/metricbeat/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Metricbeat 7.16.3-SNAPSHOT using authentication and TLS to connect to
+This example deploy Metricbeat 7.16.3 using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
index 34af1b360..21443789e 100755
--- a/metricbeat/values.yaml
+++ b/metricbeat/values.yaml
@@ -180,7 +180,7 @@ extraInitContainers: ""
 hostPathRoot: /var/lib
 
 image: "docker.elastic.co/beats/metricbeat"
-imageTag: "7.16.3-SNAPSHOT"
+imageTag: "7.16.3"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []