diff --git a/robot-systest/lib/advanced_cluster_mgmt_lib.resource b/robot-systest/lib/advanced_cluster_mgmt_lib.resource
index ab8a9fd..563eaa8 100644
--- a/robot-systest/lib/advanced_cluster_mgmt_lib.resource
+++ b/robot-systest/lib/advanced_cluster_mgmt_lib.resource
@@ -21,9 +21,9 @@
 
 *** Variables ***
 ${SUCCESS_RETURN_CODE}   0
-${CLUSTER_LAUNCH_MAX_WAIT_TIME}   12min
-${CLUSTER_LAUNCH_POL_TIME}   30sec
-${CLUSTER_REGISTER_MAX_WAIT_TIME}   7min
+${CLUSTER_CREATE_MAX_WAIT_TIME}   16min
+${CLUSTER_CREATE_POL_TIME}   30sec
+${CLUSTER_REGISTER_MAX_WAIT_TIME}   16min
 ${CLUSTER_REGISTER_POL_TIME}   30sec
 ${CLUSTER_DELETE_MAX_WAIT_TIME}   12min
 ${CLUSTER_DELETE_POL_TIME}   30sec
@@ -58,7 +58,7 @@
     Log   ${cluster_id}
     Check Cluster Age Keys   ${cluster_id}
     IF   ${wait_flag} == True
-        Wait Until Keyword Succeeds   ${CLUSTER_REGISTER_MAX_WAIT_TIME}   ${CLUSTER_REGISTER_POL_TIME}
+        Wait Until Keyword Succeeds   ${CLUSTER_CREATE_MAX_WAIT_TIME}   ${CLUSTER_CREATE_POL_TIME}
         ...   Check For Cluster To Be Ready   ${name}
     END
     RETURN   ${cluster_id}
@@ -86,7 +86,7 @@
     Log   ${cluster_id}
     Check Cluster Age Keys   ${cluster_id}
     IF   ${wait_flag} == True
-        Wait Until Keyword Succeeds   ${CLUSTER_LAUNCH_MAX_WAIT_TIME}   ${CLUSTER_LAUNCH_POL_TIME}
+        Wait Until Keyword Succeeds   ${CLUSTER_REGISTER_MAX_WAIT_TIME}   ${CLUSTER_REGISTER_POL_TIME}
         ...   Check For Cluster To Be Ready   ${name}
     END
     RETURN   ${cluster_id}