diff --git a/lib/boot/powerons.robot b/lib/boot/powerons.robot
index b3e402f..db35f67 100644
--- a/lib/boot/powerons.robot
+++ b/lib/boot/powerons.robot
@@ -14,7 +14,7 @@
 
     Open Connection and Log In  &{bmc_connection_args}
     Initiate Power On
-    Wait For OS
+    Run Keyword If   '${OS_HOST}' != '${EMPTY}'   Wait For OS
     Switch Connection  bmc_connection
     Check Power On States
     Close Connection
@@ -23,9 +23,7 @@
     [Documentation]  Checks that the BMC state, power state, and boot progress
     ...  are correctly powered on.
 
-    ${bmc_state}=  Get BMC State
-    Should Contain  ${bmc_state}  HOST_BOOTED
-    Log to Console  BMC State: ${bmc_state}
+    Wait Until Keyword Succeeds   ${OS_WAIT_TIMEOUT}  10sec  Is Host Booted
 
     ${boot_progress}=  Get Boot Progress
     Should Be Equal  ${boot_progress}  FW Progress, Starting OS
@@ -34,3 +32,9 @@
     ${power_state}=  Get Power State
     Should Be Equal  ${power_state}  ${1}
     Log to Console  Power State: ${power_state}
+
+Is Host Booted
+    ${bmc_state}=  Get BMC State
+    Should Contain  ${bmc_state}  HOST_BOOTED
+    Log to Console  BMC State: ${bmc_state}
+