diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh
index 8cd7ac9b..dcb70e0d 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh
+++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh
@@ -20,7 +20,8 @@ confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/
 proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 . /etc/confluent/functions
-while ! ping -c 1 $confluent_mgr >& /dev/null; do
+GIVUP=$(($(date +%s) + 60))
+while (! ping -c 1 $confluent_mgr >& /dev/null) && [ $(date +%s) -lt $GIVUP ]; do
 	sleep 1
 done
 
diff --git a/confluent_osdeploy/suse15/profiles/server/scripts/firstboot.sh b/confluent_osdeploy/suse15/profiles/server/scripts/firstboot.sh
index 8cd7ac9b..dcb70e0d 100644
--- a/confluent_osdeploy/suse15/profiles/server/scripts/firstboot.sh
+++ b/confluent_osdeploy/suse15/profiles/server/scripts/firstboot.sh
@@ -20,7 +20,8 @@ confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/
 proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 . /etc/confluent/functions
-while ! ping -c 1 $confluent_mgr >& /dev/null; do
+GIVUP=$(($(date +%s) + 60))
+while (! ping -c 1 $confluent_mgr >& /dev/null) && [ $(date +%s) -lt $GIVUP ]; do
 	sleep 1
 done