diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml
index cc852403e..3965800c5 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: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 4550c7348..870b7a455 100644
--- a/apm-server/README.md
+++ b/apm-server/README.md
@@ -11,6 +11,7 @@ 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 [6.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 -->
 
@@ -18,7 +19,7 @@ SLA of official GA features (see [supported configurations][] for more details).
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -42,7 +43,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -53,15 +54,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 3: `helm install apm-server --version <version> elastic/apm-server`
   - with Helm 2 (deprecated): `helm install --name apm-server --version <version> elastic/apm-server`
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.17`
+  - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -100,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                                                                                                                            | `6.8.17`                  |
+| `imageTag`                  | The APM Server Docker image tag                                                                                                                            | `6.8.18-SNAPSHOT`                  |
 | `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                                                                                                     | `{}`                               |
@@ -149,7 +150,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/apm-server/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/apm-server/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md
index 6a053983a..0625eef17 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 6.8.17 using [default values][].
+This example deploy APM Server 6.8.18-SNAPSHOT using [default values][].
 
 
 ## Usage
diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml
index 6ce291d62..a07f703b9 100644
--- a/apm-server/examples/default/test/goss.yaml
+++ b/apm-server/examples/default/test/goss.yaml
@@ -3,4 +3,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '6.8.17'
+      - '6.8.18'
diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md
index 460fcd882..5c703858d 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 6.8.17 using [APM Server OSS][] version.
+This example deploy APM Server 6.8.18-SNAPSHOT using [APM Server OSS][] version.
 
 
 ## Usage
diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml
index 6ce291d62..a07f703b9 100644
--- a/apm-server/examples/oss/test/goss.yaml
+++ b/apm-server/examples/oss/test/goss.yaml
@@ -3,4 +3,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '6.8.17'
+      - '6.8.18'
diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md
index 66b6cef61..0feefa184 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 6.8.17 using authentication and TLS to connect to
+This example deploy APM Server 6.8.18-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/apm-server/examples/security/test/goss.yaml b/apm-server/examples/security/test/goss.yaml
index 6ce291d62..a07f703b9 100644
--- a/apm-server/examples/security/test/goss.yaml
+++ b/apm-server/examples/security/test/goss.yaml
@@ -3,4 +3,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '6.8.17'
+      - '6.8.18'
diff --git a/apm-server/examples/upgrade/test/goss.yaml b/apm-server/examples/upgrade/test/goss.yaml
index 47bfb75c4..34c2299d4 100644
--- a/apm-server/examples/upgrade/test/goss.yaml
+++ b/apm-server/examples/upgrade/test/goss.yaml
@@ -3,4 +3,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - "6.8.17"
+      - "6.8.18"
diff --git a/apm-server/values.yaml b/apm-server/values.yaml
index e3ba8679a..8222140a4 100755
--- a/apm-server/values.yaml
+++ b/apm-server/values.yaml
@@ -68,7 +68,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/apm/apm-server"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index 8b4f01fb9..290601424 100755
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: elasticsearch
-version: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 1b5d470d7..7eedb9349 100644
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -6,6 +6,7 @@ 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 [6.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 -->
 
@@ -13,7 +14,7 @@ This Helm chart is a lightweight way to configure and run our official
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -53,7 +54,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -65,15 +66,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 2 (deprecated): `helm install --name elasticsearch --version <version> elastic/elasticsearch`
 
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.17`
+  - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -131,7 +132,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                                                                                                                                                                                                                                                                                | `6.8.17`                                 |
+| `imageTag`                         | The Elasticsearch Docker image tag                                                                                                                                                                                                                                                                                | `6.8.18-SNAPSHOT`                                 |
 | `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                                                                                                                                                                                                                                    | `{}`                                             |
@@ -395,7 +396,7 @@ about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
 [#63]: https://github.com/elastic/helm-charts/issues/63
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/elasticsearch/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/elasticsearch/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md
index 347a15667..a5da7b0e8 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 6.8.17 with authentication and
+This example deploy a single node Elasticsearch 6.8.18-SNAPSHOT with authentication and
 custom [values][].
 
 
diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md
index 4e0c08544..f0007085d 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 6.8.17 cluster using
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT cluster using
 [default values][].
 
 
diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
index 1f791d851..3cc616bd8 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" : "6.8.17"'
+      - '"number" : "6.8.18"'
       - '"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 37ec848be..5aaf15c63 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 6.8.17 cluster on [Docker for Mac][]
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT 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 4dff0af34..84a2bc1ad 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 6.8.17 cluster on [Kind][]
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT 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 46f681c9d..28ce08d56 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 6.8.17 cluster on [MicroK8S][]
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT 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 d55b1cf79..c67ddabbf 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 6.8.17 cluster on [Minikube][]
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT 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 fbd8d2cdc..261410f83 100644
--- a/elasticsearch/examples/multi/README.md
+++ b/elasticsearch/examples/multi/README.md
@@ -1,6 +1,6 @@
 # Multi
 
-This example deploy an Elasticsearch 6.8.17 cluster composed of 3 different Helm
+This example deploy an Elasticsearch 6.8.18-SNAPSHOT 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 574ee02db..e94eab9df 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 6.8.17 cluster on [OpenShift][]
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT cluster on [OpenShift][]
 using [custom values][].
 
 ## Usage
diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
index d5704b098..b855a934f 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" : "6.8.17"'
+      - '"number" : "6.8.18"'
       - '"cluster_name" : "elasticsearch"'
       - "You Know, for Search"
diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md
index 91f203e48..7b241629c 100644
--- a/elasticsearch/examples/oss/README.md
+++ b/elasticsearch/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy a 3 nodes Elasticsearch 6.8.17 cluster using
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT cluster using
 [Elasticsearch OSS][] version.
 
 ## Usage
diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
index ebeed417e..4c590a9d3 100644
--- a/elasticsearch/examples/oss/test/goss.yaml
+++ b/elasticsearch/examples/oss/test/goss.yaml
@@ -11,6 +11,6 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number" : "6.8.17"'
+      - '"number" : "6.8.18"'
       - '"cluster_name" : "oss"'
       - 'You Know, for Search'
diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md
index cc2fea5fb..41a4fed53 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 6.8.17 with authentication and
+This example deploy a 3 nodes Elasticsearch 6.8.18-SNAPSHOT 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 1649caace..8df34d64b 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" : "6.8.17"'
+      - '"number" : "6.8.18"'
       - '"cluster_name" : "upgrade"'
       - "You Know, for Search"
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index bf27b1cd5..8571772f0 100755
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -57,7 +57,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/elasticsearch/elasticsearch"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 
 podAnnotations: {}
diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
index de1554bcd..0002dcf0e 100755
--- a/filebeat/Chart.yaml
+++ b/filebeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: filebeat
-version: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 f5e4b95aa..49fa61410 100644
--- a/filebeat/README.md
+++ b/filebeat/README.md
@@ -6,6 +6,7 @@ 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 [6.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 -->
 
@@ -13,7 +14,7 @@ This Helm chart is a lightweight way to configure and run our official
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -41,7 +42,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -53,15 +54,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 2 (deprecated): `helm install --name filebeat --version <version> elastic/filebeat`
 
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.17`
+  - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -136,7 +137,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                                                                                                                                                | `6.8.17-SNAPSHOT`                   |
+| `imageTag`                     | The filebeat Docker image tag                                                                                                                                                | `6.8.18-SNAPSHOT-SNAPSHOT`                   |
 | `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`                             |
@@ -235,7 +236,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/filebeat/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/filebeat/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md
index 79920b443..4c07971d7 100644
--- a/filebeat/examples/default/README.md
+++ b/filebeat/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 6.8.17 using [default values][].
+This example deploy Filebeat 6.8.18-SNAPSHOT using [default values][].
 
 
 ## Usage
diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml
index 1a4040aa9..2fda76060 100644
--- a/filebeat/examples/default/test/goss.yaml
+++ b/filebeat/examples/default/test/goss.yaml
@@ -29,7 +29,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-6.8.17'
+      - 'filebeat-6.8.18'
 
 file:
   /usr/share/filebeat/filebeat.yml:
@@ -44,4 +44,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://elasticsearch-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md
index e90358c16..44e02c296 100644
--- a/filebeat/examples/deployment/README.md
+++ b/filebeat/examples/deployment/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 6.8.17-SNAPSHOT using [default values][] as a Kubernetes Deployment.
+This example deploy Filebeat 6.8.18-SNAPSHOT-SNAPSHOT using [default values][] as a Kubernetes Deployment.
 
 
 ## Usage
diff --git a/filebeat/examples/deployment/test/goss.yaml b/filebeat/examples/deployment/test/goss.yaml
index 8ca074c87..221d23dc3 100644
--- a/filebeat/examples/deployment/test/goss.yaml
+++ b/filebeat/examples/deployment/test/goss.yaml
@@ -3,4 +3,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-6.8.17'
+      - 'filebeat-6.8.18'
diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md
index 5edc32bbe..f7c402f28 100644
--- a/filebeat/examples/oss/README.md
+++ b/filebeat/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Filebeat 6.8.17 using [Filebeat OSS][] version.
+This example deploy Filebeat 6.8.18-SNAPSHOT using [Filebeat OSS][] version.
 
 
 ## Usage
diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
index d9cb57fb0..2aa29e864 100644
--- a/filebeat/examples/oss/test/goss.yaml
+++ b/filebeat/examples/oss/test/goss.yaml
@@ -19,4 +19,4 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-6.8.17'
+      - 'filebeat-6.8.18'
diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md
index 1f1c02a40..405173aca 100644
--- a/filebeat/examples/security/README.md
+++ b/filebeat/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Filebeat 6.8.17 using authentication and TLS to connect to
+This example deploy Filebeat 6.8.18-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml
index feb25fef5..ec71025d2 100644
--- a/filebeat/examples/security/test/goss.yaml
+++ b/filebeat/examples/security/test/goss.yaml
@@ -3,7 +3,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'filebeat-6.8.17'
+      - 'filebeat-6.8.18'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
diff --git a/filebeat/examples/upgrade/test/goss.yaml b/filebeat/examples/upgrade/test/goss.yaml
index 257bbf301..eba0b7283 100644
--- a/filebeat/examples/upgrade/test/goss.yaml
+++ b/filebeat/examples/upgrade/test/goss.yaml
@@ -29,7 +29,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - "filebeat-6.8.17"
+      - "filebeat-6.8.18"
 
 file:
   /usr/share/filebeat/filebeat.yml:
diff --git a/filebeat/values.yaml b/filebeat/values.yaml
index 5b69a5b42..def8c617c 100755
--- a/filebeat/values.yaml
+++ b/filebeat/values.yaml
@@ -142,7 +142,7 @@ hostAliases: []
 #  - "foo.local"
 #  - "bar.local"
 image: "docker.elastic.co/beats/filebeat"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/helpers/examples.mk b/helpers/examples.mk
index 407f680a5..6a5dbbbd9 100644
--- a/helpers/examples.mk
+++ b/helpers/examples.mk
@@ -1,7 +1,7 @@
 GOSS_VERSION := v0.3.6
 GOSS_FILE ?= goss.yaml
 GOSS_SELECTOR ?= release=$(RELEASE)
-STACK_VERSION := 6.8.17
+STACK_VERSION := 6.8.18-SNAPSHOT
 TIMEOUT := 900s
 
 .PHONY: help
diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index ccf7f04be..b40b2dc8d 100755
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: kibana
-version: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 9cde40409..c68fb4760 100644
--- a/kibana/README.md
+++ b/kibana/README.md
@@ -6,13 +6,14 @@ 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 [6.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 -->
 
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -39,7 +40,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -50,15 +51,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 3: `helm install kibana --version <version> elastic/kibana`
   - with Helm 2 (deprecated): `helm install --name kibana --version <version> elastic/kibana`
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.17`
+  - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -94,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                                                                                                                                                                    | `6.8.17`                  |
+| `imageTag`            | The Kibana Docker image tag                                                                                                                                                                    | `6.8.18-SNAPSHOT`                  |
 | `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                                                    | `{}`                               |
@@ -206,7 +207,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/kibana/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/kibana/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md
index 9f58428b8..bd32ec286 100644
--- a/kibana/examples/default/README.md
+++ b/kibana/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Kibana 6.8.17 using [default values][].
+This example deploy Kibana 6.8.18-SNAPSHOT using [default values][].
 
 
 ## Usage
diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml
index e8a63aab7..65c87088f 100644
--- a/kibana/examples/default/test/goss.yaml
+++ b/kibana/examples/default/test/goss.yaml
@@ -3,7 +3,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number":"6.8.17"'
+      - '"number":"6.8.18"'
 
   http://localhost:5601/app/kibana:
     status: 200
diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md
index 5b0c53b23..443cb59ff 100644
--- a/kibana/examples/openshift/README.md
+++ b/kibana/examples/openshift/README.md
@@ -1,6 +1,6 @@
 # OpenShift
 
-This example deploy Kibana 6.8.17 on [OpenShift][] using [custom values][].
+This example deploy Kibana 6.8.18-SNAPSHOT on [OpenShift][] using [custom values][].
 
 ## Usage
 
diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md
index 8883e7bc6..f15265ee0 100644
--- a/kibana/examples/oss/README.md
+++ b/kibana/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Kibana 6.8.17 using [Kibana OSS][] version.
+This example deploy Kibana 6.8.18-SNAPSHOT using [Kibana OSS][] version.
 
 
 ## Usage
diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md
index b299adc8b..fa6620bbb 100644
--- a/kibana/examples/security/README.md
+++ b/kibana/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Kibana 6.8.17 using authentication and TLS to connect to
+This example deploy Kibana 6.8.18-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/kibana/examples/upgrade/test/goss.yaml b/kibana/examples/upgrade/test/goss.yaml
index 0f6b5ebf1..87dbbb1cd 100644
--- a/kibana/examples/upgrade/test/goss.yaml
+++ b/kibana/examples/upgrade/test/goss.yaml
@@ -3,7 +3,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"number":"6.8.17"'
+      - '"number":"6.8.18"'
 
   http://localhost:5601/app/kibana:
     status: 200
diff --git a/kibana/values.yaml b/kibana/values.yaml
index d846b6029..ba77ef7a0 100755
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -35,7 +35,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/kibana/kibana"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 
 # additionals labels
diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml
index 809fec6e6..6dbb4bd4b 100755
--- a/logstash/Chart.yaml
+++ b/logstash/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: logstash
-version: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 5182e589a..4e5cd8c1f 100644
--- a/logstash/README.md
+++ b/logstash/README.md
@@ -11,6 +11,7 @@ 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 [6.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 -->
 
@@ -18,7 +19,7 @@ SLA of official GA features (see [supported configurations][] for more details).
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -41,7 +42,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -53,15 +54,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 2 (deprecated): `helm install --name logstash --version <version> elastic/logstash`
 
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.17`
+  - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -118,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                                                                                                                                                                                                        | `6.8.17`                     |
+| `imageTag`                | The Logstash Docker image tag                                                                                                                                                                                                        | `6.8.18-SNAPSHOT`                     |
 | `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][]                   |
@@ -196,7 +197,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions
 about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/logstash/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/logstash/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md
index d8fac16de..5f01a34d3 100644
--- a/logstash/examples/default/README.md
+++ b/logstash/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Logstash 6.8.17 using [default values][].
+This example deploy Logstash 6.8.18-SNAPSHOT using [default values][].
 
 
 ## Usage
diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml
index 5ac4ef78d..b3ce78e3d 100644
--- a/logstash/examples/default/test/goss.yaml
+++ b/logstash/examples/default/test/goss.yaml
@@ -9,7 +9,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"version" : "6.8.17"'
+      - '"version" : "6.8.18"'
       - '"http_address" : "0.0.0.0:9600"'
 
 file:
diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md
index e31864719..7c280d3db 100644
--- a/logstash/examples/elasticsearch/README.md
+++ b/logstash/examples/elasticsearch/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch
 
-This example deploy Logstash 6.8.17 which connects to Elasticsearch (see
+This example deploy Logstash 6.8.18-SNAPSHOT which connects to Elasticsearch (see
 [values][]).
 
 
diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml
index 7ff21a5b8..fcc47540b 100644
--- a/logstash/examples/elasticsearch/test/goss.yaml
+++ b/logstash/examples/elasticsearch/test/goss.yaml
@@ -21,7 +21,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"version" : "6.8.17"'
+      - '"version" : "6.8.18"'
       - '"http_address" : "0.0.0.0:9600"'
   http://elasticsearch-master:9200/_cat/indices:
     status: 200
diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md
index eae0b887d..5109120a3 100644
--- a/logstash/examples/oss/README.md
+++ b/logstash/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Logstash 6.8.17 using [Logstash OSS][] version.
+This example deploy Logstash 6.8.18-SNAPSHOT using [Logstash OSS][] version.
 
 
 ## Usage
diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml
index fd09e10ec..9d59a3dcf 100644
--- a/logstash/examples/oss/test/goss.yaml
+++ b/logstash/examples/oss/test/goss.yaml
@@ -9,7 +9,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"version" : "6.8.17"'
+      - '"version" : "6.8.18"'
       - '"http_address" : "0.0.0.0:9600"'
 
 file:
diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml
index 13563fce0..f7c75a4e6 100644
--- a/logstash/examples/security/test/goss.yaml
+++ b/logstash/examples/security/test/goss.yaml
@@ -21,7 +21,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"version" : "6.8.17"'
+      - '"version" : "6.8.18"'
       - '"http_address" : "0.0.0.0:9600"'
   https://security-master:9200/_cat/indices:
     status: 200
diff --git a/logstash/examples/upgrade/test/goss.yaml b/logstash/examples/upgrade/test/goss.yaml
index 5ac4ef78d..b3ce78e3d 100644
--- a/logstash/examples/upgrade/test/goss.yaml
+++ b/logstash/examples/upgrade/test/goss.yaml
@@ -9,7 +9,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - '"version" : "6.8.17"'
+      - '"version" : "6.8.18"'
       - '"http_address" : "0.0.0.0:9600"'
 
 file:
diff --git a/logstash/values.yaml b/logstash/values.yaml
index df8de6f20..37cf11a82 100755
--- a/logstash/values.yaml
+++ b/logstash/values.yaml
@@ -72,7 +72,7 @@ hostAliases: []
 #  - "bar.local"
 
 image: "docker.elastic.co/logstash/logstash"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []
 
diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml
index 7422a6f0a..c18e48136 100755
--- a/metricbeat/Chart.yaml
+++ b/metricbeat/Chart.yaml
@@ -5,8 +5,8 @@ maintainers:
 - email: helm-charts@elastic.co
   name: Elastic
 name: metricbeat
-version: 6.8.17
-appVersion: 6.8.17
+version: 6.8.18-SNAPSHOT
+appVersion: 6.8.18-SNAPSHOT
 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 abf1a6e37..bb14e8372 100644
--- a/metricbeat/README.md
+++ b/metricbeat/README.md
@@ -6,6 +6,7 @@ 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 [6.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 -->
 
@@ -13,7 +14,7 @@ This Helm chart is a lightweight way to configure and run our official
 - [Requirements](#requirements)
 - [Installing](#installing)
   - [Install released version using Helm repository](#install-released-version-using-helm-repository)
-  - [Install development version using 6.8 branch and 6.8.17 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
+  - [Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions)
 - [Upgrading](#upgrading)
 - [Usage notes](#usage-notes)
 - [Configuration](#configuration)
@@ -39,7 +40,7 @@ See [supported configurations][] for more details.
 
 ## Installing
 
-This chart is tested with the latest 6.8.17 version.
+This chart is tested with the latest 6.8.18-SNAPSHOT version.
 
 ### Install released version using Helm repository
 
@@ -51,15 +52,15 @@ This chart is tested with the latest 6.8.17 version.
   - with Helm 3: `helm install metricbeat --version <version> elastic/metricbeat`
   - with Helm 2 (deprecated): `helm install --name metricbeat --version <version> elastic/metricbeat`
 
-### Install development version using 6.8 branch and 6.8.17 versions
+### Install development version using 6.8 branch and 6.8.18-SNAPSHOT versions
 
 * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git`
 
 * Checkout the branch : git checkout 6.8
 
 * Install it:
-  - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.17`
-  - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.17`
+  - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.18-SNAPSHOT`
+  - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.18-SNAPSHOT`
 
 
 ## Upgrading
@@ -129,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                                                                                                                                              | `6.8.17`                    |
+| `imageTag`                     | The Metricbeat Docker image tag                                                                                                                                              | `6.8.18-SNAPSHOT`                    |
 | `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`                                                             | `""`                                 |
@@ -223,7 +224,7 @@ about our development and testing process.
 
 [6.x]: https://github.com/elastic/helm-charts/releases
 [#471]: https://github.com/elastic/helm-charts/pull/471
-[6.8.17]: https://github.com/elastic/helm-charts/blob/6.8.17/metricbeat/README.md
+[6.8.18-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.18-SNAPSHOT/metricbeat/README.md
 [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md
 [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md
 [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md
diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md
index 9bafd6e0f..d613e46c2 100644
--- a/metricbeat/examples/default/README.md
+++ b/metricbeat/examples/default/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Metricbeat 6.8.17 using [default values][].
+This example deploy Metricbeat 6.8.18-SNAPSHOT using [default values][].
 
 
 ## Usage
diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml
index 1049e6820..39f0c22e2 100644
--- a/metricbeat/examples/default/test/goss-metrics.yaml
+++ b/metricbeat/examples/default/test/goss-metrics.yaml
@@ -21,13 +21,13 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
 
   'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat':
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
@@ -41,4 +41,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://elasticsearch-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml
index 10dd78bf1..b72aab2ec 100644
--- a/metricbeat/examples/default/test/goss.yaml
+++ b/metricbeat/examples/default/test/goss.yaml
@@ -25,12 +25,12 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
   'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat':
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
@@ -45,4 +45,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://elasticsearch-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md
index 01406c4c5..11ffabb44 100644
--- a/metricbeat/examples/oss/README.md
+++ b/metricbeat/examples/oss/README.md
@@ -1,6 +1,6 @@
 # OSS
 
-This example deploy Metricbeat 6.8.17 using [Metricbeat OSS][] version.
+This example deploy Metricbeat 6.8.18-SNAPSHOT using [Metricbeat OSS][] version.
 
 
 ## Usage
diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml
index 8f10340bd..cf572a9e6 100644
--- a/metricbeat/examples/oss/test/goss-metrics.yaml
+++ b/metricbeat/examples/oss/test/goss-metrics.yaml
@@ -21,12 +21,12 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
   http://oss-master:9200/_search?q=metricset.name:state_deployment:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
@@ -39,4 +39,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://oss-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml
index 71a4556df..4eaaf739b 100644
--- a/metricbeat/examples/oss/test/goss.yaml
+++ b/metricbeat/examples/oss/test/goss.yaml
@@ -25,12 +25,12 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
   http://oss-master:9200/_search?q=metricset.name:container:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
@@ -44,4 +44,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: http://oss-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md
index 08fca1d3e..958ed1a0c 100644
--- a/metricbeat/examples/security/README.md
+++ b/metricbeat/examples/security/README.md
@@ -1,6 +1,6 @@
 # Security
 
-This example deploy Metricbeat 6.8.17 using authentication and TLS to connect to
+This example deploy Metricbeat 6.8.18-SNAPSHOT using authentication and TLS to connect to
 Elasticsearch (see [values][]).
 
 
diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml
index 883715d0a..3effd49db 100644
--- a/metricbeat/examples/security/test/goss-metrics.yaml
+++ b/metricbeat/examples/security/test/goss-metrics.yaml
@@ -21,7 +21,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
@@ -29,7 +29,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
@@ -45,4 +45,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: https://security-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml
index a70fe43f3..231b032d3 100644
--- a/metricbeat/examples/security/test/goss.yaml
+++ b/metricbeat/examples/security/test/goss.yaml
@@ -25,7 +25,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
@@ -33,7 +33,7 @@ http:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-6.8.17'
+      - 'metricbeat-6.8.18'
     allow-insecure: true
     username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
     password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
@@ -50,4 +50,4 @@ command:
     exit-status: 0
     stdout:
       - 'elasticsearch: https://security-master:9200'
-      - 'version: 6.8.17'
+      - 'version: 6.8.18'
diff --git a/metricbeat/examples/upgrade/test/goss-metrics.yaml b/metricbeat/examples/upgrade/test/goss-metrics.yaml
index f2aaba502..470dc8073 100644
--- a/metricbeat/examples/upgrade/test/goss-metrics.yaml
+++ b/metricbeat/examples/upgrade/test/goss-metrics.yaml
@@ -21,13 +21,13 @@ http:
     status: 200
     timeout: 2000
     body:
-      - "metricbeat-6.8.17"
+      - "metricbeat-6.8.18"
 
   http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat:
     status: 200
     timeout: 2000
     body:
-      - "metricbeat-6.8.17"
+      - "metricbeat-6.8.18"
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
diff --git a/metricbeat/examples/upgrade/test/goss.yaml b/metricbeat/examples/upgrade/test/goss.yaml
index f9e890b5c..2b4e9f5b3 100644
--- a/metricbeat/examples/upgrade/test/goss.yaml
+++ b/metricbeat/examples/upgrade/test/goss.yaml
@@ -25,12 +25,12 @@ http:
     status: 200
     timeout: 2000
     body:
-      - "metricbeat-6.8.17"
+      - "metricbeat-6.8.18"
   'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat':
     status: 200
     timeout: 2000
     body:
-      - "metricbeat-6.8.17"
+      - "metricbeat-6.8.18"
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
index a9525908c..2b168958f 100755
--- a/metricbeat/values.yaml
+++ b/metricbeat/values.yaml
@@ -181,7 +181,7 @@ extraInitContainers: ""
 hostPathRoot: /var/lib
 
 image: "docker.elastic.co/beats/metricbeat"
-imageTag: "6.8.17"
+imageTag: "6.8.18-SNAPSHOT"
 imagePullPolicy: "IfNotPresent"
 imagePullSecrets: []