diff --git a/bitnami/elasticsearch/templates/coordinating-deploy.yaml b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
index 7d2fd48ee..4d7961ad8 100644
--- a/bitnami/elasticsearch/templates/coordinating-deploy.yaml
+++ b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
@@ -21,6 +21,10 @@ spec:
         app: {{ template "elasticsearch.name" . }}
         release: {{ .Release.Name | quote }}
         role: "coordinating-only"
+{{- with .Values.coordinating.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }
     spec:
       {{- if .Values.securityContext.enabled }}
       securityContext:
diff --git a/bitnami/elasticsearch/templates/data-statefulset.yaml b/bitnami/elasticsearch/templates/data-statefulset.yaml
index b045b82f7..e2c0bac5a 100644
--- a/bitnami/elasticsearch/templates/data-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -31,6 +31,10 @@ spec:
         chart: {{ template "elasticsearch.chart" . }}
         release: {{ .Release.Name | quote }}
         role: "data"
+{{- with .Values.data.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }
     spec:
       {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
diff --git a/bitnami/elasticsearch/templates/ingest-deploy.yaml b/bitnami/elasticsearch/templates/ingest-deploy.yaml
index a2665e433..d2270a716 100644
--- a/bitnami/elasticsearch/templates/ingest-deploy.yaml
+++ b/bitnami/elasticsearch/templates/ingest-deploy.yaml
@@ -22,6 +22,10 @@ spec:
         app: {{ template "elasticsearch.name" . }}
         release: {{ .Release.Name | quote }}
         role: "ingest"
+{{- with .Values.ingest.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }
     spec:
       {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
diff --git a/bitnami/elasticsearch/templates/master-statefulset.yaml b/bitnami/elasticsearch/templates/master-statefulset.yaml
index 89d0bc580..afc7570ce 100644
--- a/bitnami/elasticsearch/templates/master-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/master-statefulset.yaml
@@ -23,6 +23,10 @@ spec:
         chart: {{ template "elasticsearch.chart" . }}
         release: {{ .Release.Name | quote }}
         role: "master"
+{{- with .Values.master.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }
     spec:
       {{- include "elasticsearch.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.securityContext.enabled }}
@@ -133,4 +137,4 @@ spec:
           name: {{ template "elasticsearch.fullname" . }}
       {{- end }}
       - name: "data"
-        emptyDir: {}
\ No newline at end of file
+        emptyDir: {}
diff --git a/bitnami/elasticsearch/templates/metrics-deploy.yaml b/bitnami/elasticsearch/templates/metrics-deploy.yaml
index 5fa14087d..b83ed2a96 100644
--- a/bitnami/elasticsearch/templates/metrics-deploy.yaml
+++ b/bitnami/elasticsearch/templates/metrics-deploy.yaml
@@ -23,6 +23,10 @@ spec:
         release: {{ .Release.Name | quote }}
         chart: {{ template "elasticsearch.chart" . }}
         role: "metrics"
+{{- with .Values.metrics.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }
     spec:
 {{- include "elasticsearch.imagePullSecrets" . | indent 6 }}
       containers:
diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml
index 107774ba0..7463ce87f 100644
--- a/bitnami/elasticsearch/values.yaml
+++ b/bitnami/elasticsearch/values.yaml
@@ -85,6 +85,9 @@ master:
     annotations: {}
     # loadBalancerIP:
 
+  ## Provide annotations for the master pods.
+  podAnnotations: {}
+
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -151,6 +154,9 @@ coordinating:
     annotations: {}
     # loadBalancerIP:
 
+  ## Provide annotations for the coordinating pods.
+  podAnnotations: {}
+
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -189,6 +195,8 @@ data:
   antiAffinity: "soft"
   ## node affinity
   # nodeAffinity:
+  ## Provide annotations for the data pods.
+  podAnnotations: {}
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -268,6 +276,9 @@ ingest:
     annotations: {}
     # loadBalancerIP:
 
+  ## Provide annotations for the ingest pods.
+  podAnnotations: {}
+
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -306,6 +317,8 @@ metrics:
     ##
     # pullSecrets:
     #   - myRegistryKeySecretName
+  ## Provide annotations for the metrics pods.
+  podAnnotations: {}
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9108"