diff --git a/op-continue-mpreboot@.service.in b/op-continue-mpreboot@.service.in
index c4262c5..c5cc9d6 100644
--- a/op-continue-mpreboot@.service.in
+++ b/op-continue-mpreboot@.service.in
@@ -10,6 +10,7 @@
 ConditionPathExists=/run/openbmc/mpreboot@%i
 
 [Service]
+ExecStart=/bin/rm -f /run/openbmc/mpreboot@%i
 ExecStart=/usr/bin/openpower-proc-control startHostMpReboot
 Type=oneshot
 RemainAfterExit=yes
diff --git a/op-enter-mpreboot@.service.in b/op-enter-mpreboot@.service.in
index 8d4af5b..3543946 100644
--- a/op-enter-mpreboot@.service.in
+++ b/op-enter-mpreboot@.service.in
@@ -9,6 +9,8 @@
 RemainAfterExit=yes
 Type=oneshot
 ExecStart=/usr/bin/openpower-proc-control enterMpReboot
+ExecStart=/bin/mkdir -p /run/openbmc/
+ExecStart=/bin/touch /run/openbmc/mpreboot@%i
 
 [Install]
 WantedBy=obmc-host-diagnostic-mode@%i.target