diff --git a/common/recipes-phosphor/flash/phosphor-software-manager.bb b/common/recipes-phosphor/flash/phosphor-software-manager.bb
index f6f47b8..2319667 100644
--- a/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -64,6 +64,8 @@
     obmc-flash-bmc-ubirw.service \
     obmc-flash-bmc-ubiro@.service \
     obmc-flash-bmc-setenv@.service \
+    obmc-flash-bmc-ubirw-remove.service \
+    obmc-flash-bmc-ubiro-remove@.service \
     "
 
 # Name of the mtd device where the ubi volumes should be created
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
new file mode 100644
index 0000000..f2a39d6
--- /dev/null
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Deletes read-only ubi volume %I
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart={sbindir}/obmc-flash-bmc ubiremove ro-%i
diff --git a/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
new file mode 100644
index 0000000..71a652b
--- /dev/null
+++ b/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Deletes BMC read-write ubi volume
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart={sbindir}/obmc-flash-bmc ubiremove rw