diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index 875a90f..d14bcef 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -218,10 +218,10 @@
             grep /xyz/openbmc_project/software/ | tail -c 9)
 
     if [[ -z "$activeVersion" ]]; then
-        vols=$(ubinfo -a | grep -e "kernel-" -e "rofs-" | cut -c 14-)
+        vols=$(ubinfo -a | grep "rofs-" | cut -c 14-)
         vols=(${vols})
     else
-        vols=$(ubinfo -a | grep -e "kernel-" -e "rofs-" | \
+        vols=$(ubinfo -a | grep "rofs-" | \
                 grep -v "$activeVersion" | cut -c 14-)
         vols=(${vols})
     fi
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
index 41769a4..f8c9135 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service
@@ -1,8 +1,9 @@
 [Unit]
-Description=Clean up UBI volumes unattached to a BMC version
+Description=Clean up UBI volumes unattached to a BMC version after DeleteAll
 
 [Service]
 Type=oneshot
 RemainAfterExit=no
+ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup
 ExecStart=/usr/bin/env obmc-flash-bmc ubicleanup
 SyslogIdentifier=obmc-flash-bmc