diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
index 1043578..d3efca5 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
@@ -1,7 +1,9 @@
 [Unit]
 Description=Host%i (Stopped)
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-stop@%i.target
+Wants=obmc-host-stopping@%i.target
+After=obmc-host-stopping@%i.target
+Before=obmc-power-stop-pre@%i.target
 Conflicts=obmc-host-start@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes