diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index 88ee6e7..94d8f70 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -5,6 +5,7 @@
 ...               -v IMAGE_FILE_PATH:<path/*.tar>  bmc_code_update.robot
 
 Library           ../../lib/code_update_utils.py
+Library           ../../lib/gen_robot_keyword.py
 Variables         ../../data/variables.py
 Resource          ../../lib/utils.robot
 Resource          ../../lib/boot_utils.robot
@@ -226,7 +227,7 @@
     [Documentation]  Do code update test case setup.
     # - Clean up all existing BMC dumps.
 
-    Delete All Dumps
+    Run Key  Delete All Dumps  ignore=1
     Run Keyword And Ignore Error  Smart Power Off
 
 Test Teardown Execution
diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 2025707..bcc9105 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -18,6 +18,7 @@
 
 Library           ../../lib/bmc_ssh_utils.py
 Library           ../../lib/code_update_utils.py
+Library           ../../lib/gen_robot_keyword.py
 Variables         ../../data/variables.py
 Resource          ../../lib/boot_utils.robot
 Resource          code_update_utils.robot
@@ -227,8 +228,8 @@
     # - Clean up all currently install PNOR images.
 
     Run Keyword And Ignore Error  Smart Power Off
-    Delete All Dumps
-    Delete Error Logs
+    Run Key  Delete All Dumps  ignore=1
+    Run Key  Delete Error Logs  ignore=1
     Run Keyword If  'true' == '${DELETE_OLD_PNOR_IMAGES}'
     ...  Delete All PNOR Images
     Run Keyword If  'true' == '${DELETE_OLD_GUARD_FILE}'  BMC Execute Command