diff --git a/extended/code_update/code_update_utils.robot b/extended/code_update/code_update_utils.robot
index 640e421..a54b7f2 100644
--- a/extended/code_update/code_update_utils.robot
+++ b/extended/code_update/code_update_utils.robot
@@ -54,17 +54,12 @@
 
 
 System Readiness Test
-    ${l_status} =   Run Keyword    Verify Ping and REST Authentication
+    ${l_status} =   Run Keyword and Return Status
+    ...   Verify Ping and REST Authentication
     Run Keyword If  '${l_status}' == '${False}'
     ...   Fail  msg=System not in ideal state to use [ERROR]
 
 
-Check If BMC is Up
-    ${status}=    Verify Ping and REST Authentication
-    Run Keyword If   '${status}' == '${False}'
-    ...     Fail   msg=Ping and REST auth failed
-
-
 Validate BMC Version
     [Arguments]   ${args}=post
     # Check BMC installed version
diff --git a/extended/code_update/update_bmc.robot b/extended/code_update/update_bmc.robot
index 6c22803..6d4ca55 100644
--- a/extended/code_update/update_bmc.robot
+++ b/extended/code_update/update_bmc.robot
@@ -41,7 +41,6 @@
     Run Keyword If   '${session_active}' == '${True}'
     ...    Trigger Warm Reset via Reboot
 
-    Wait Until Keyword Succeeds
-    ...  30 min   10 sec     Check If BMC is Up
+    Check If BMC is Up    30 min   10 sec
     Sleep  1 min
     Validate BMC Version