diff --git a/extended/code_update/update_bmc.robot b/extended/code_update/update_bmc.robot
index 40bad5b..00ea393 100644
--- a/extended/code_update/update_bmc.robot
+++ b/extended/code_update/update_bmc.robot
@@ -65,9 +65,7 @@
     ...   Set Policy Setting   RESTORE_LAST_STATE
     Prepare For Update
 
-    # Wait time is increased temporary to 10 mins due
-    # to openbmc/openbmc#673
-    Check If BMC is Up    10 min   10 sec
+    Check If BMC is Up  20 min  10 sec
     Check Boot Count And Time
 
     Wait For BMC Ready
diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index bf97520..43ca11f 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -31,11 +31,12 @@
     [Documentation]  Prepare system for PNOR update.
 
     Initiate Power Off
+
     Trigger Warm Reset
-    Check If BMC is Up    10 min   10 sec
+    Check If BMC is Up  20 min  10 sec
 
     Wait Until Keyword Succeeds
-    ...    10 min   10 sec   Verify BMC State   BMC_READY
+    ...  20 min  10 sec  Verify BMC State  BMC_READY
 
     Clear BMC Record Log