diff --git a/defaults/main.yml b/defaults/main.yml
index 47f7eb45..f4ece0f3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -72,4 +72,4 @@ es_delete_unmanaged_file: true
 es_delete_unmanaged_native: true
 
 es_healthcheck_auth_scheme: https
-es_healthcheck_timeout: 3600
+es_healthcheck_retries: 360
diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml
index 36d928b3..a950dda7 100644
--- a/tasks/elasticsearch-config.yml
+++ b/tasks/elasticsearch-config.yml
@@ -29,7 +29,7 @@
     state: directory
     owner: "{{ es_user }}"
     group: "{{ es_group }}"
-    mode: "2750"
+    mode: "750"
   with_items:
     - "{{ es_log_dir }}"
     - "{{ es_data_dirs }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 5b3c2121..7796ffea 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -68,7 +68,7 @@
     auth_method: http_auth
     wait_for: status
     to_be: green
-    timeout: "{{ es_healthcheck_timeout }}"
+    poll: "{{ es_healthcheck_retries }}"
   when: not es_bootstrap | default(false)
 
 - name: flush handlers
diff --git a/templates/jvm.options.j2 b/templates/jvm.options.j2
index 3acf3988..24a1904d 100644
--- a/templates/jvm.options.j2
+++ b/templates/jvm.options.j2
@@ -22,8 +22,8 @@
 -Xms{{ es_heap_size }}
 -Xmx{{ es_heap_size }}
 {% else %}
--Xms2g
--Xmx2g
+-Xms{{ (ansible_memtotal_mb * 0.5) | int }}m
+-Xmx{{ (ansible_memtotal_mb * 0.5) | int }}m
 {% endif %}
 
 ################################################################