diff --git a/mmc/obmc-flash-mmc-mount.service.in b/mmc/obmc-flash-mmc-mount.service.in
index 8b21537..36316fd 100644
--- a/mmc/obmc-flash-mmc-mount.service.in
+++ b/mmc/obmc-flash-mmc-mount.service.in
@@ -5,11 +5,8 @@
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/bin/mkdir -p @MEDIA_DIR@/rofs-a
-ExecStart=/bin/mkdir -p @MEDIA_DIR@/rofs-b
+ExecStart=/usr/bin/obmc-flash-bmc mmc-mount @MEDIA_DIR@
 ExecStart=/bin/mkdir -p @MEDIA_DIR@/hostfw
-ExecStart=-/bin/sh -c '/bin/mount PARTLABEL=rofs-a @MEDIA_DIR@/rofs-a -t ext4 -o ro || /bin/rmdir @MEDIA_DIR@/rofs-a'
-ExecStart=-/bin/sh -c '/bin/mount PARTLABEL=rofs-b @MEDIA_DIR@/rofs-b -t ext4 -o ro || /bin/rmdir @MEDIA_DIR@/rofs-b'
 ExecStart=-/bin/mount PARTLABEL=hostfw @MEDIA_DIR@/hostfw -t ext4
 
 [Install]
diff --git a/mmc/obmc-flash-mmc-umount.service.in b/mmc/obmc-flash-mmc-umount.service.in
index 535377c..b0d4831 100644
--- a/mmc/obmc-flash-mmc-umount.service.in
+++ b/mmc/obmc-flash-mmc-umount.service.in
@@ -7,6 +7,8 @@
 RemainAfterExit=no
 ExecStart=-/bin/umount @MEDIA_DIR@/rofs-a
 ExecStart=-/bin/umount @MEDIA_DIR@/rofs-b
+ExecStart=-/bin/umount @MEDIA_DIR@/rofs-a-functional
+ExecStart=-/bin/umount @MEDIA_DIR@/rofs-b-functional
 
 [Install]
 WantedBy=xyz.openbmc_project.Software.BMC.Updater.service