diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2
index c0cc584..a0c8f84 100644
--- a/templates/elasticsearch.yml.j2
+++ b/templates/elasticsearch.yml.j2
@@ -30,4 +30,12 @@ xpack.monitoring.enabled: false
 
 {% if not "alerting" in es_xpack_features %}
 xpack.watcher.enabled: false
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+{% if not "ml" in es_xpack_features %}
+xpack.ml.enabled: false
+{% endif %}
+
+{% if not "graph" in es_xpack_features %}
+xpack.graph.enabled: false
+{% endif %}