diff --git a/common/recipes-phosphor/flash/openpower-software-manager.bb b/common/recipes-phosphor/flash/openpower-software-manager.bb
index 04cc0dc..38bc424 100644
--- a/common/recipes-phosphor/flash/openpower-software-manager.bb
+++ b/common/recipes-phosphor/flash/openpower-software-manager.bb
@@ -49,7 +49,6 @@
         obmc-flash-bios-ubiumount-ro@.service \
         obmc-flash-bios-ubiumount-rw@.service \
         obmc-flash-bios-ubipatch.service \
-        obmc-flash-bios-squashfsmount@.service \
         obmc-flash-bios-ubiremount.service \
         obmc-flash-bios-updatesymlinks.service \
         "
diff --git a/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service b/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service
deleted file mode 100644
index 96c1eb6..0000000
--- a/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Mount SquashFS image pnor-ro-%I
-Requires=obmc-flash-bios-ubiattach.service
-After=obmc-flash-bios-ubiattach.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bios squashfsmount pnor-ro-%i %i
-SyslogIdentifier=obmc-flash-bios
diff --git a/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service b/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
index b4bd2d7..d03041d 100644
--- a/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
+++ b/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
@@ -1,11 +1,13 @@
 [Unit]
-Description=Mount UBIFS volume pnor-prsv and pnor-rw-%I
+Description=Mount UBIFS volumes pnor-ro-%I, pnor-rw-%I and pnor-prsv
 Requires=obmc-flash-bios-ubiattach.service
 After=obmc-flash-bios-ubiattach.service
+OnFailure=obmc-flash-bios-ubiumount-ro@%i.service obmc-flash-bios-ubiumount-rw@%i.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=no
+ExecStart=/usr/bin/env obmc-flash-bios squashfsmount pnor-ro-%i %i
 ExecStart=/usr/bin/env obmc-flash-bios ubimount pnor-rw-%i
 ExecStart=/usr/bin/env obmc-flash-bios ubimount pnor-prsv
 SyslogIdentifier=obmc-flash-bios