diff --git a/meson.build b/meson.build
index fbb21a0..938c10b 100644
--- a/meson.build
+++ b/meson.build
@@ -133,8 +133,10 @@
 
     unit_files += [
         'mmc/obmc-flash-mmc@.service.in',
+        'mmc/obmc-flash-mmc-mount.service.in',
         'mmc/obmc-flash-mmc-remove@.service.in',
         'mmc/obmc-flash-mmc-setprimary@.service.in',
+        'mmc/obmc-flash-mmc-umount.service.in',
     ]
 endif
 
diff --git a/mmc/obmc-flash-mmc-mount.service.in b/mmc/obmc-flash-mmc-mount.service.in
new file mode 100644
index 0000000..5214738
--- /dev/null
+++ b/mmc/obmc-flash-mmc-mount.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Mount BMC rofs volumes after a reboot
+Before=xyz.openbmc_project.Software.BMC.Updater.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/bin/mkdir -p @MEDIA_DIR@/rofs-a
+ExecStart=/bin/mkdir -p @MEDIA_DIR@/rofs-b
+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'
+
+[Install]
+WantedBy=xyz.openbmc_project.Software.BMC.Updater.service
diff --git a/mmc/obmc-flash-mmc-umount.service.in b/mmc/obmc-flash-mmc-umount.service.in
new file mode 100644
index 0000000..535377c
--- /dev/null
+++ b/mmc/obmc-flash-mmc-umount.service.in
@@ -0,0 +1,12 @@
+[Unit]
+Description=Unmount BMC rofs volumes
+After=xyz.openbmc_project.Software.BMC.Updater.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=-/bin/umount @MEDIA_DIR@/rofs-a
+ExecStart=-/bin/umount @MEDIA_DIR@/rofs-b
+
+[Install]
+WantedBy=xyz.openbmc_project.Software.BMC.Updater.service