diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml
index 5d9d4e78f..21ebdcbfa 100644
--- a/bitnami/elasticsearch/Chart.yaml
+++ b/bitnami/elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: elasticsearch
-version: 4.7.2
-appVersion: 6.7.1
+version: 5.0.0
+appVersion: 7.0.0
 description: A highly scalable open-source full-text search and analytics engine
 keywords:
 - elasticsearch
diff --git a/bitnami/elasticsearch/templates/coordinating-deploy.yaml b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
index 851d623cb..7d2fd48ee 100644
--- a/bitnami/elasticsearch/templates/coordinating-deploy.yaml
+++ b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
@@ -51,7 +51,7 @@ spec:
       {{- if .Values.coordinating.nodeAffinity }}
 {{ toYaml .Values.coordinating.nodeAffinity | indent 8 }}
       {{- end }}
-{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
+      {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.sysctlImage.enabled }}
       ## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
       initContainers:
diff --git a/bitnami/elasticsearch/templates/data-statefulset.yaml b/bitnami/elasticsearch/templates/data-statefulset.yaml
index a7338c5ba..b045b82f7 100644
--- a/bitnami/elasticsearch/templates/data-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -32,6 +32,7 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "data"
     spec:
+      {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
diff --git a/bitnami/elasticsearch/templates/ingest-deploy.yaml b/bitnami/elasticsearch/templates/ingest-deploy.yaml
index a21b6e257..a2665e433 100644
--- a/bitnami/elasticsearch/templates/ingest-deploy.yaml
+++ b/bitnami/elasticsearch/templates/ingest-deploy.yaml
@@ -23,6 +23,7 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "ingest"
     spec:
+      {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
diff --git a/bitnami/elasticsearch/templates/master-deploy.yaml b/bitnami/elasticsearch/templates/master-statefulset.yaml
similarity index 89%
rename from bitnami/elasticsearch/templates/master-deploy.yaml
rename to bitnami/elasticsearch/templates/master-statefulset.yaml
index 4573ebe27..89d0bc580 100644
--- a/bitnami/elasticsearch/templates/master-deploy.yaml
+++ b/bitnami/elasticsearch/templates/master-statefulset.yaml
@@ -1,5 +1,5 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1beta2
+kind: StatefulSet
 metadata:
   name: {{ template "elasticsearch.master.fullname" . }}
   labels:
@@ -12,8 +12,9 @@ spec:
   selector:
     matchLabels:
       app: {{ template "elasticsearch.name" . }}
-      release: "{{ .Release.Name }}"
+      release: {{ .Release.Name | quote }}
       role: "master"
+  serviceName: {{ template "elasticsearch.master.fullname" . }}
   replicas: {{ .Values.master.replicas }}
   template:
     metadata:
@@ -23,6 +24,7 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "master"
     spec:
+      {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
@@ -52,7 +54,6 @@ spec:
       {{- if .Values.master.nodeAffinity }}
 {{ toYaml .Values.master.nodeAffinity | indent 8 }}
       {{- end }}
-{{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       {{- if .Values.sysctlImage.enabled }}
       ## Image that performs the sysctl operation to modify Kernel settings (needed sometimes to avoid boot errors)
       initContainers:
@@ -66,16 +67,20 @@ spec:
       containers:
       - name: "elasticsearch"
         image: {{ template "elasticsearch.image" . }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         {{- if .Values.securityContext.enabled }}
         securityContext:
           runAsUser: {{ .Values.securityContext.runAsUser }}
         {{- end }}
-        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         env:
         - name: ELASTICSEARCH_CLUSTER_NAME
           value: {{ .Values.name | quote }}
         - name: ELASTICSEARCH_CLUSTER_HOSTS
           value: {{ template "elasticsearch.discovery.fullname" . }}
+        - name: ELASTICSEARCH_CLUSTER_MASTER_HOSTS
+          {{- $elasticsearchMasterFullname := include "elasticsearch.master.fullname" . }}
+          {{- $replicas := int .Values.master.replicas }}
+          value: {{range $i, $e := until $replicas }}{{ $elasticsearchMasterFullname }}-{{ $e }} {{ end }}
         {{- if .Values.plugins }}
         - name: ELASTICSEARCH_PLUGINS
           value: {{ .Values.plugins | quote }}
@@ -110,7 +115,7 @@ spec:
           httpGet:
             path: /_cluster/health?local=true
             port: 9200
-      {{- end }}
+        {{- end }}
         resources:
 {{ toYaml .Values.master.resources | indent 10 }}
         volumeMounts:
@@ -128,4 +133,4 @@ spec:
           name: {{ template "elasticsearch.fullname" . }}
       {{- end }}
       - name: "data"
-        emptyDir: {}
+        emptyDir: {}
\ No newline at end of file
diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml
index a755ea145..a2ef68abb 100644
--- a/bitnami/elasticsearch/values-production.yaml
+++ b/bitnami/elasticsearch/values-production.yaml
@@ -13,7 +13,7 @@
 image:
   registry: docker.io
   repository: bitnami/elasticsearch
-  tag: 6.7.1
+  tag: 7.0.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml
index c29fd2498..8228c5ecc 100644
--- a/bitnami/elasticsearch/values.yaml
+++ b/bitnami/elasticsearch/values.yaml
@@ -13,7 +13,7 @@
 image:
   registry: docker.io
   repository: bitnami/elasticsearch
-  tag: 6.7.1
+  tag: 7.0.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images