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/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