diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
index 208892f..75afd43 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
@@ -2,6 +2,7 @@
 Description=Stop Host%i (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
+Before=obmc-host-stopping@%i.target
 Conflicts=obmc-host-start@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
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
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
index bc81a57..6209c52 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
@@ -1,7 +1,9 @@
 [Unit]
 Description=Host%i (Stopping)
 Wants={SYSTEMD_DEFAULT_TARGET}
+Wants=obmc-host-stop-pre@%i.target
 After=obmc-host-stop-pre@%i.target
+Before=obmc-host-stopped@%i.target
 Conflicts=obmc-host-start@%i.target
 Conflicts=obmc-host-starting@%i.target
 RefuseManualStart=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
index 2f130c9..50d5050 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
@@ -2,6 +2,8 @@
 Description=Power%i Off (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
+Wants=obmc-host-stopped@%i.target
+After=obmc-host-stopped@%i.target
 Conflicts=obmc-chassis-poweron@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index b32d76f..f0429d7 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
@@ -1,5 +1,6 @@
 [Unit]
 Description=Power%i Off
+Wants=obmc-power-stop-pre@%i.target
 After=obmc-power-stop-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
 Conflicts=obmc-chassis-poweron@%i.target