diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 0fd9e5b..7f87d1d 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -33,6 +33,7 @@
 ${QUIET}                          ${1}
 ${IMAGE_FILE_PATH}                ${EMPTY}
 ${DELETE_OLD_PNOR_IMAGES}         false
+${DELETE_OLD_GUARD_FILE}          false
 ${ALTERNATE_IMAGE_FILE_PATH}      ${EMPTY}
 
 *** Test Cases ***
@@ -50,7 +51,6 @@
     OBMC Reboot (off)
 
 
-
 Post Update Boot To OS
     [Documentation]  Boot the host OS
     [Tags]  Post_Update_Boot_To_OS
@@ -164,10 +164,13 @@
     # - Clean up all existing BMC dumps.
     # - Clean up all currently install PNOR images.
 
+    Initiate Host PowerOff
     Delete All Dumps
     Delete Error Logs
     Run Keyword If  'true' == '${DELETE_OLD_PNOR_IMAGES}'
     ...  Delete All PNOR Images
+    Run Keyword If  'true' == '${DELETE_OLD_GUARD_FILE}'  BMC Execute Command
+    ...  rm -f /var/lib/phosphor-software-manager/pnor/prsv/GUARD
 
 
 Upload And Activate Multiple BMC Images Setup
diff --git a/lib/resource.txt b/lib/resource.txt
index 8f00efb..6a3690d 100755
--- a/lib/resource.txt
+++ b/lib/resource.txt
@@ -60,6 +60,7 @@
 # The caller must set this to the string "true" in order to delete images. The
 # code is picky.
 ${DELETE_OLD_PNOR_IMAGES}   false
+${DELETE_OLD_GUARD_FILE}    false
 
 # Caller can specify a value for LAST_KNOWN_GOOD_VERSION to indicate that if
 # the machine already has that version on it, the update should be skipped.
diff --git a/tools/generate_argumentfile.sh b/tools/generate_argumentfile.sh
index 3316500..0556e7c 100755
--- a/tools/generate_argumentfile.sh
+++ b/tools/generate_argumentfile.sh
@@ -31,4 +31,5 @@
 echo "--variable BMC_IMAGE_FILE_PATH:$BMC_IMAGE_FILE_PATH" >> $ARG_FILE
 echo "--variable BAD_IMAGES_DIR_PATH:$BAD_IMAGES_DIR_PATH" >> $ARG_FILE
 echo "--variable DELETE_OLD_PNOR_IMAGES:$DELETE_OLD_PNOR_IMAGES" >> $ARG_FILE
+echo "--variable DELETE_OLD_GUARD_FILE:$DLETE_OLD_GUARD_FILE" >> $ARG_FILE
 echo "--variable LAST_KNOWN_GOOD_VERSION:$LAST_KNOWN_GOOD_VERSION" >> $ARG_FILE