diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index 3110ddb..0ade9fb 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -74,15 +74,13 @@
     Delete all PNOR images from the BMC.
     """
 
+    keyword.run_key("Initiate Host PowerOff")
+
     status, images = keyword.run_key("Get Software Objects  "
                                      + var.VERSION_PURPOSE_HOST)
     for image_name in images:
-        BuiltIn().log_to_console(image_name)
-        # Delete twice, in case the image is in the /tmp/images directory
-        keyword.run_key("Call Method  " + image_name + '/'
-                        + "  Delete  data={\"data\":[]}")
-        keyword.run_key("Call Method  " + image_name + '/'
-                        + "  Delete  data={\"data\":[]}")
+        keyword.run_key("Delete Image And Verify  " + image_name + "  "
+                        + var.VERSION_PURPOSE_HOST)
 
 
 def wait_for_activation_state_change(version_id, initial_state):