diff --git a/bitnami/elasticsearch/templates/coordinating-deploy.yaml b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
index 62fc927f9..a925e2321 100644
--- a/bitnami/elasticsearch/templates/coordinating-deploy.yaml
+++ b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
@@ -76,8 +76,10 @@ spec:
         env:
         - name: ELASTICSEARCH_CLUSTER_NAME
           value: {{ .Values.name | quote }}
+        {{- if .Values.plugins }}
         - name: ELASTICSEARCH_PLUGINS
           value: {{ .Values.plugins | quote }}
+        {{- end }}
         - name: ELASTICSEARCH_HEAP_SIZE
           value: {{ .Values.coordinating.heapSize | quote }}
         - name: ELASTICSEARCH_IS_DEDICATED_NODE
diff --git a/bitnami/elasticsearch/templates/data-statefulset.yaml b/bitnami/elasticsearch/templates/data-statefulset.yaml
index b619a0f6e..1eb25debc 100644
--- a/bitnami/elasticsearch/templates/data-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -72,8 +72,10 @@ spec:
         env:
         - name: ELASTICSEARCH_CLUSTER_NAME
           value: {{ .Values.name | quote }}
+        {{- if .Values.plugins }}
         - name: ELASTICSEARCH_PLUGINS
           value: {{ .Values.plugins | quote }}
+        {{- end }}
         - name: ELASTICSEARCH_HEAP_SIZE
           value: {{ .Values.data.heapSize | quote }}
         - name: ELASTICSEARCH_IS_DEDICATED_NODE
diff --git a/bitnami/elasticsearch/templates/ingest-deploy.yaml b/bitnami/elasticsearch/templates/ingest-deploy.yaml
index e4506942e..0236b6e4d 100644
--- a/bitnami/elasticsearch/templates/ingest-deploy.yaml
+++ b/bitnami/elasticsearch/templates/ingest-deploy.yaml
@@ -77,8 +77,10 @@ spec:
         env:
         - name: ELASTICSEARCH_CLUSTER_NAME
           value: {{ .Values.name | quote }}
+        {{- if .Values.plugins }}
         - name: ELASTICSEARCH_PLUGINS
           value: {{ .Values.plugins | quote }}
+        {{- end }}
         - name: ELASTICSEARCH_HEAP_SIZE
           value: {{ .Values.ingest.heapSize | quote }}
         - name: ELASTICSEARCH_IS_DEDICATED_NODE
diff --git a/bitnami/elasticsearch/templates/master-deploy.yaml b/bitnami/elasticsearch/templates/master-deploy.yaml
index 80800b75c..bafe5149c 100644
--- a/bitnami/elasticsearch/templates/master-deploy.yaml
+++ b/bitnami/elasticsearch/templates/master-deploy.yaml
@@ -77,7 +77,9 @@ spec:
         env:
         - name: ELASTICSEARCH_CLUSTER_NAME
           value: {{ .Values.name | quote }}
+        {{- if .Values.plugins }}
         - name: ELASTICSEARCH_PLUGINS
+        {{- end }}
           value: {{ .Values.plugins | quote }}
         - name: ELASTICSEARCH_HEAP_SIZE
           value: {{ .Values.master.heapSize | quote }}
diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml
index f4e991c51..b32722acf 100644
--- a/bitnami/elasticsearch/values-production.yaml
+++ b/bitnami/elasticsearch/values-production.yaml
@@ -35,7 +35,7 @@ name: elastic
 ## Customize elasticsearch configuration
 ## ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
 ##
-config:
+# config:
 
 ## Elasticsearch master-eligible node parameters
 ##
diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml
index b638cbe4d..ba6ca2113 100644
--- a/bitnami/elasticsearch/values.yaml
+++ b/bitnami/elasticsearch/values.yaml
@@ -54,7 +54,7 @@ name: elastic
 ## Customize elasticsearch configuration
 ## ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
 ##
-config:
+# config:
 
 ## Elasticsearch master-eligible node parameters
 ##