diff --git a/op-enter-mpreboot@.service.in b/op-enter-mpreboot@.service.in
index 4d39aa0..635328f 100644
--- a/op-enter-mpreboot@.service.in
+++ b/op-enter-mpreboot@.service.in
@@ -1,8 +1,10 @@
 [Unit]
 Description=Start memory preserving reboot host%i
-Wants=obmc-host-stop-pre@%i.target
-Before=obmc-host-stop-pre@%i.target
+Wants=obmc-host-stopped@%i.target
+After=obmc-host-stopped@%i.target
 After=op-stop-instructions@%i.service
+After=phosphor-reset-sensor-states@%i.service
+Before=phosphor-reboot-host@%i.service
 Conflicts=obmc-host-startmin@%i.target
 
 [Service]