diff --git a/data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh b/data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh
index 2325e5a67c9..35431a84912 100755
--- a/data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh
+++ b/data/data/bootstrap/baremetal/files/usr/local/bin/master-bmh-update.sh
@@ -15,9 +15,13 @@ while [ "$(oc get bmh -n openshift-machine-api -o name | wc -l)" -lt 1  ]; do
     sleep 20
 done
 
-while [ "$(oc get bmh -n openshift-machine-api -l installer.openshift.io/role=control-plane -o json | jq '.items[].status.provisioning.state' | grep -v provisioned -c)" -gt 0  ]; do
+N="0"
+while [ "$N" -eq "0" ] ; do
+    N=$(oc get bmh -n openshift-machine-api -l installer.openshift.io/role=control-plane --no-headers=true | wc -l)
+done
+while [ "$(oc get bmh -n openshift-machine-api -l installer.openshift.io/role=control-plane -o json | jq '.items[].status.provisioning.state' | grep provisioned -c)" -ne "$N"  ]; do
     echo "Waiting for masters to become provisioned"
-    oc get bmh -A
+    oc get bmh -A || true
     sleep 20
 done