diff --git a/ubi/obmc-flash-bmc-ubiremount.service b/ubi/obmc-flash-bmc-ubiremount.service
new file mode 100644
index 0000000..52ac12b
--- /dev/null
+++ b/ubi/obmc-flash-bmc-ubiremount.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Remount the ubi volume after a reboot
+Wants=xyz.openbmc_project.Software.BMC.Updater.service
+Before=xyz.openbmc_project.Software.BMC.Updater.service
+Wants=obmc-flash-bmc-setenv@rwreset.service
+After=obmc-flash-bmc-setenv@rwreset.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/usr/bin/obmc-flash-bmc ubiremount
+
+[Install]
+WantedBy=multi-user.target