diff --git a/defaults/main.yml b/defaults/main.yml
index 8de86f4..81cc21d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -29,7 +29,7 @@ es_data_dirs:
 es_log_dir: "/var/log/elasticsearch"
 es_action_auto_create_index: true
 es_max_open_files: 65536
-es_max_threads: "{{ 2048 if ( es_version is version_compare('6.0.0', '<')) else 8192 }}"
+es_max_threads: 8192
 es_max_map_count: 262144
 es_allow_downgrades: false
 es_xpack_features: []
diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2
index abb6c56..9ceac83 100644
--- a/templates/elasticsearch.yml.j2
+++ b/templates/elasticsearch.yml.j2
@@ -15,10 +15,6 @@ node.name: {{inventory_hostname}}
 
 # Path to directory containing configuration (this file and logging.yml):
 
-{% if (es_version is version_compare('6.0.0', '<')) %}
-path.conf: {{ es_conf_dir }}
-{% endif %}
-
 path.data: {{ es_data_dirs | array_to_str }}
 
 path.logs: {{ es_log_dir }}