diff --git a/defaults/main.yml b/defaults/main.yml
index e8d3e7d..e14b98f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -39,6 +39,7 @@ elasticsearch_destructive_requires_name: 'true'
 elasticsearch_define_heap_size: False
 elasticsearch_heap_size: 2g
 elasticsearch_additional_java_opts: '-server -Djava.awt.headless=true -Dfile.encoding=UTF-8'
+elasticsearch_java_io_tmpdir: '/var/tmp'
 elasticsearch_additional_conf:
   - { name: 'search.max_buckets', value: '65535'}
 
diff --git a/templates/elasticsearch-default.j2 b/templates/elasticsearch-default.j2
index 9fc9bfb..bfd6488 100644
--- a/templates/elasticsearch-default.j2
+++ b/templates/elasticsearch-default.j2
@@ -35,6 +35,8 @@ ES_JAVA_OPTS="{{ elasticsearch_additional_java_opts }}"
 # Path to the GC log file
 #ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log
 
+ES_TMPDIR={{ elasticsearch_java_io_tmpdir }}
+
 ################################
 # Elasticsearch service
 ################################
diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2
index 73704e0..e3baac9 100644
--- a/templates/elasticsearch.yml.j2
+++ b/templates/elasticsearch.yml.j2
@@ -21,7 +21,7 @@ cluster.name: {{ elasticsearch_cluster_name }}
 # Use a descriptive name for the node:
 #
 node.name: {{ ansible_fqdn }}
-{% if elasticsearch_major_version >= 7 and elasticsearch_minor_version >= 9 %}
+{% if elasticsearch_major_version >= 7 %}
 xpack.ml.enabled: false
 {% endif %}