diff --git a/op-enter-mpreboot@.service.in b/op-enter-mpreboot@.service.in
index 0455298..61860a3 100644
--- a/op-enter-mpreboot@.service.in
+++ b/op-enter-mpreboot@.service.in
@@ -1,7 +1,9 @@
 [Unit]
 Description=Start memory preserving reboot host%i
-Wants=obmc-host-stopped@%i.target
-After=obmc-host-stopped@%i.target
+Wants=obmc-host-stop-pre@%i.target
+After=obmc-host-stop-pre@%i.target
+Wants=obmc-host-stopping@%i.target
+Before=obmc-host-stopping@%i.target
 Before=op-stop-instructions@%i.service
 After=phosphor-reset-sensor-states@%i.service
 Before=phosphor-reboot-host@%i.service