diff --git a/ubi/obmc-flash-bmc-cleanup.service b/ubi/obmc-flash-bmc-cleanup.service
new file mode 100644
index 0000000..6742d95
--- /dev/null
+++ b/ubi/obmc-flash-bmc-cleanup.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Clean up UBI volumes unattached to a BMC version after DeleteAll
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStartPre=/usr/bin/obmc-flash-bmc createenvbackup
+ExecStart=/usr/bin/obmc-flash-bmc ubicleanup