diff --git a/infra/rancher-master b/infra/rancher-master
index abe84edd..05213a22 100644
--- a/infra/rancher-master
+++ b/infra/rancher-master
@@ -25,6 +25,11 @@ echo "/root/.kube/config found"
 # remove k3s implementation of kubectl
 rm /usr/local/bin/kubectl
 
+echo "waiting for rancher guest cluster readiness"
+while ! kubectl wait pod -n cattle-system --timeout=300s --for=condition=ready -l app=cattle-cluster-agent; do
+  sleep 2
+done
+
 echo "url https://rancher.$name.$ocp4_domain" >> /var/log/px-deploy/completed/tracking
 echo "cred portworx1!portworx1!" >> /var/log/px-deploy/completed/tracking
 
@@ -35,4 +40,4 @@ Rancher Web UI: https://rancher.$name.$ocp4_domain
 Admin User Name: admin
 Password: portworx1!portworx1!
 +================================================+
-EOF
\ No newline at end of file
+EOF