diff --git a/Makefile.am b/Makefile.am
index f9bb234..3257f33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,9 @@
   pcie-poweroff@.service \
   xyz.openbmc_project.Control.Host.NMI.service \
   op-stop-instructions@.service \
-  op-cfam-reset.service
+  op-cfam-reset.service \
+  op-continue-mpreboot@.service \
+  op-enter-mpreboot@.service
 
 if ENABLE_PHAL
   systemdsystemunit_DATA += set-spi-mux.service
diff --git a/configure.ac b/configure.ac
index 887cc54..fecae53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,4 +111,6 @@
 AC_CONFIG_FILES([xyz.openbmc_project.Control.Host.NMI.service])
 AC_CONFIG_FILES([op-stop-instructions@.service])
 AC_CONFIG_FILES([op-cfam-reset.service])
+AC_CONFIG_FILES([op-continue-mpreboot@.service])
+AC_CONFIG_FILES([op-enter-mpreboot@.service])
 AC_OUTPUT
diff --git a/op-continue-mpreboot@.service.in b/op-continue-mpreboot@.service.in
new file mode 100644
index 0000000..c4262c5
--- /dev/null
+++ b/op-continue-mpreboot@.service.in
@@ -0,0 +1,18 @@
+[Unit]
+Description=Continue mp reboot on host%i
+After=obmc-host-start-pre@%i.target
+Wants=obmc-host-starting@%i.target
+Before=obmc-host-starting@%i.target
+Before=obmc-host-started@%i.target
+Wants=obmc-power-on@%i.target
+After=obmc-power-on@%i.target
+Conflicts=obmc-host-stop@%i.target
+ConditionPathExists=/run/openbmc/mpreboot@%i
+
+[Service]
+ExecStart=/usr/bin/openpower-proc-control startHostMpReboot
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=obmc-host-startmin@%i.target
diff --git a/op-enter-mpreboot@.service.in b/op-enter-mpreboot@.service.in
new file mode 100644
index 0000000..8d4af5b
--- /dev/null
+++ b/op-enter-mpreboot@.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Start memory preserving reboot host%i
+Wants=obmc-host-stop-pre@%i.target
+Before=obmc-host-stop-pre@%i.target
+After=op-stop-instructions@%i.service
+Conflicts=obmc-host-startmin@%i.target
+
+[Service]
+RemainAfterExit=yes
+Type=oneshot
+ExecStart=/usr/bin/openpower-proc-control enterMpReboot
+
+[Install]
+WantedBy=obmc-host-diagnostic-mode@%i.target