diff --git a/stable/elasticsearch/Chart.yaml b/stable/elasticsearch/Chart.yaml
index 8c5f3fba39..62e3f0c561 100755
--- a/stable/elasticsearch/Chart.yaml
+++ b/stable/elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: elasticsearch
 home: https://www.elastic.co/products/elasticsearch
-version: 1.32.0
+version: 1.32.1
 appVersion: 6.8.2
 description: Flexible and powerful open source, distributed real-time search and analytics
   engine.
diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
index 430f9332b3..d2990e18ac 100644
--- a/stable/elasticsearch/templates/data-statefulset.yaml
+++ b/stable/elasticsearch/templates/data-statefulset.yaml
@@ -12,7 +12,9 @@ spec:
   selector:
     matchLabels:
       app: {{ template "elasticsearch.name" . }}
+      component: "{{ .Values.data.name }}"
       release: {{ .Release.Name }}
+      role: data
   serviceName: {{ template "elasticsearch.data.fullname" . }}
   replicas: {{ .Values.data.replicas }}
   template:
diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml
index 141f017dea..b7fc7b6c9c 100644
--- a/stable/elasticsearch/templates/master-statefulset.yaml
+++ b/stable/elasticsearch/templates/master-statefulset.yaml
@@ -12,7 +12,9 @@ spec:
   selector:
     matchLabels:
       app: {{ template "elasticsearch.name" . }}
+      component: "{{ .Values.master.name }}"
       release: {{ .Release.Name }}
+      role: master
   serviceName: {{ template "elasticsearch.master.fullname" . }}
   replicas: {{ .Values.master.replicas }}
   template: