diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 48026b08..3341c8a1 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: zammad
-version: 2.5.0
+version: 2.6.0
 appVersion: 3.5.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
diff --git a/zammad/README.md b/zammad/README.md
index 8881ce7d..a91f3592 100644
--- a/zammad/README.md
+++ b/zammad/README.md
@@ -30,7 +30,7 @@ The following table lists the configurable parameters of the zammad chart and th
 | Parameter                                          | Description                                      | Default                         |
 | -------------------------------------------------- | ------------------------------------------------ | ------------------------------- |
 | `image.repository`                                 | Container image to use                           | `zammad/zammad-docker-compose`  |
-| `image.tag`                                        | Container image tag to deploy                    | `3.4.0-18`                      |
+| `image.tag`                                        | Container image tag to deploy                    | `3.5.0-2`                       |
 | `image.pullPolicy`                                 | Container pull policy                            | `IfNotPresent`                  |
 | `image.imagePullSecrets`                           | An array of imagePullSecrets                     | `[]`                            |
 | `service.type`                                     | Service type                                     | `ClusterIP`                     |
@@ -45,6 +45,7 @@ The following table lists the configurable parameters of the zammad chart and th
 | `envConfig.elasticsearch.port`                     | Elasticsearch port                               | `9200`                          |
 | `envConfig.elasticsearch.user`                     | Elasticsearch user                               | `""`                            |
 | `envConfig.elasticsearch.pass`                     | Elasticsearch pass                               | `""`                            |
+| `envConfig.elasticsearch.reindex`                  | Elasticsearch reindex is run on start            | `true`                          |
 | `envConfig.memcached.host`                         | Memcached host                                   | `zammad-memcached`              |
 | `envConfig.memcached.port`                         | Memcached port                                   | `11211`                         |
 | `envConfig.postgresql.host`                        | PostgreSql host                                  | `zammad-postgresql`             |
@@ -76,7 +77,7 @@ The following table lists the configurable parameters of the zammad chart and th
 | `affinity`                                         | Affinity                                         | `{}`                            |
 | `elasticsearch.enabled`                            | Use Elasticsearch dependency                     | `true`                          |
 | `elasticsearch.image`                              | Elasticsearch docker image                       | `zammad/zammad-docker-compose`  |
-| `elasticsearch.imageTag`                           | Elasticsearch docker image tag                   | `zammad-elasticsearch-3.4.0-18` |
+| `elasticsearch.imageTag`                           | Elasticsearch docker image tag                   | `zammad-elasticsearch-3.5.0-2`  |
 | `elasticsearch.clusterName`                        | Elasticsearch cluster name                       | `zammad`                        |
 | `elasticsearch.replicas`                           | Elasticsearch replicas                           | `1`                             |
 | `elasticsearch.clusterHealthCheckParams`           | Workaround to get ES test work in GitHubCI       | `"timeout=1s"`                  |
diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml
index 85d70328..688e3721 100644
--- a/zammad/templates/configmap-init.yaml
+++ b/zammad/templates/configmap-init.yaml
@@ -13,7 +13,9 @@ data:
     bundle exec rails r 'Setting.set("es_user", "{{ .Values.envConfig.elasticsearch.user }}")'
     bundle exec rails r 'Setting.set("es_password", "{{ .Values.envConfig.elasticsearch.pass }}")'
     {{ end }}
+    {{- if and .Values.envConfig.elasticsearch.reindex }}
     bundle exec rake searchindex:rebuild
+    {{ end }}
     echo "elasticsearch init complete :)"
   postgresql-init: |-
     #!/bin/bash
diff --git a/zammad/templates/statefulset.yaml b/zammad/templates/statefulset.yaml
index 5ec0f33c..8984cb7e 100644
--- a/zammad/templates/statefulset.yaml
+++ b/zammad/templates/statefulset.yaml
@@ -61,7 +61,7 @@ spec:
         - name: {{ template "zammad.fullname" . }}-init
           mountPath: /docker-entrypoint.sh
           readOnly: true
-          subPath: postgresql-init          
+          subPath: postgresql-init
       - name: elasticsearch-init
         image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/zammad/values.yaml b/zammad/values.yaml
index ad61a93d..03f8b46d 100644
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: zammad/zammad-docker-compose
-  tag: 3.5.0
+  tag: 3.5.0-2
   pullPolicy: IfNotPresent
   imagePullSecrets: []
   # - name: "image-pull-secret"
@@ -32,6 +32,7 @@ envConfig:
     port: 9200
     user: ""
     pass: ""
+    reindex: true
   memcached:
     # host env var is only used when memcached.enabled is false
     host: zammad-memcached
@@ -159,7 +160,7 @@ affinity: {}
 elasticsearch:
   enabled: true
   image: "zammad/zammad-docker-compose"
-  imageTag: "zammad-elasticsearch-3.5.0"
+  imageTag: "zammad-elasticsearch-3.5.0-2"
   clusterName: zammad
   replicas: 1
   # Workaround to get helm test to work in GitHub action CI