diff --git a/stable/elasticsearch/Chart.yaml b/stable/elasticsearch/Chart.yaml
index 007c11c497..054d3c235f 100755
--- a/stable/elasticsearch/Chart.yaml
+++ b/stable/elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 name: elasticsearch
 home: https://www.elastic.co/products/elasticsearch
-version: 1.17.0
+version: 1.17.1
 appVersion: 6.5.4
 description: Flexible and powerful open source, distributed real-time search and analytics
   engine.
diff --git a/stable/elasticsearch/templates/configmap.yaml b/stable/elasticsearch/templates/configmap.yaml
index de1b7c2f87..bd9afe3137 100644
--- a/stable/elasticsearch/templates/configmap.yaml
+++ b/stable/elasticsearch/templates/configmap.yaml
@@ -41,10 +41,19 @@ data:
 
 {{- if .Values.cluster.xpackEnable }}
     # see https://www.elastic.co/guide/en/x-pack/current/xpack-settings.html
+  {{- if .Values.appVersion gt 5.4 or .Values.appVersion eq 5.4 }}
     xpack.ml.enabled: ${XPACK_ML_ENABLED:false}
+  {{- end }}
     xpack.monitoring.enabled: ${XPACK_MONITORING_ENABLED:false}
     xpack.security.enabled: ${XPACK_SECURITY_ENABLED:false}
     xpack.watcher.enabled: ${XPACK_WATCHER_ENABLED:false}
+{{- else }}
+  {{- if .Values.appVersion gt 5.4 or .Values.appVersion eq 5.4 }}
+    xpack.ml.enabled: false
+  {{- end }}
+    xpack.monitoring.enabled: false
+    xpack.security.enabled: false
+    xpack.watcher.enabled: false
 {{- end }}
 {{- else if hasPrefix "6." .Values.appVersion }}
     # see https://github.com/kubernetes/kubernetes/issues/3595