diff --git a/roles/install_cluster/defaults/main.yml b/roles/install_cluster/defaults/main.yml
index 1996f7af..036f8d4c 100644
--- a/roles/install_cluster/defaults/main.yml
+++ b/roles/install_cluster/defaults/main.yml
@@ -27,3 +27,6 @@ host_discovery_states:
 cluster_installation_states:
   - installing
   - installing-pending-user-action
+
+# Time to be waited for all hosts to be discovered
+hosts_discovery_minutes: 20
diff --git a/roles/install_cluster/tasks/main.yml b/roles/install_cluster/tasks/main.yml
index 9b774e8d..4a0e9f53 100644
--- a/roles/install_cluster/tasks/main.yml
+++ b/roles/install_cluster/tasks/main.yml
@@ -7,7 +7,7 @@
     inventory_nodes: "{{ groups['masters'] + groups['workers'] | default([]) }}"
 
 # Monitor hosts discovery
-- name: Allow up to 20 minutes for all hosts to be discovered
+- name: "Allow up to {{ hosts_discovery_minutes }} minutes for all hosts to be discovered"
   uri:
     url: "{{ URL_ASSISTED_INSTALLER_CLUSTER }}"
     method: GET
@@ -17,7 +17,7 @@
   until:
     - (cluster.json.hosts | length) == (inventory_nodes | length)
     - cluster.json.status in host_discovery_states
-  retries: 20
+  retries: "{{ hosts_discovery_minutes }}"
   delay: 60
   when: install | bool == True
 
@@ -210,4 +210,4 @@
   until: cluster.json.status in cluster_installation_states
   retries: 5
   delay: 60
-  
\ No newline at end of file
+