diff --git a/target_files/obmc-host-started@.target b/target_files/obmc-host-started@.target
index de76e46..1db9faa 100644
--- a/target_files/obmc-host-started@.target
+++ b/target_files/obmc-host-started@.target
@@ -1,6 +1,7 @@
 [Unit]
 Description=Host%i (Started)
 After=multi-user.target
+Wants=obmc-host-starting@%i.target
 After=obmc-host-starting@%i.target
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
diff --git a/target_files/obmc-host-starting@.target b/target_files/obmc-host-starting@.target
index e568aea..9da182a 100644
--- a/target_files/obmc-host-starting@.target
+++ b/target_files/obmc-host-starting@.target
@@ -1,6 +1,7 @@
 [Unit]
 Description=Host%i (Starting)
 After=multi-user.target
+Wants=obmc-host-start-pre@%i.target
 After=obmc-host-start-pre@%i.target
 Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
diff --git a/target_files/obmc-host-stop-pre@.target b/target_files/obmc-host-stop-pre@.target
index 1ca4d55..8e9d5c0 100644
--- a/target_files/obmc-host-stop-pre@.target
+++ b/target_files/obmc-host-stop-pre@.target
@@ -1,6 +1,7 @@
 [Unit]
 Description=Stop Host%i (Pre)
 After=multi-user.target
+Wants=obmc-host-stopping@%i.target
 Before=obmc-host-stopping@%i.target
 Conflicts=obmc-host-startmin@%i.target
 RefuseManualStart=yes
diff --git a/target_files/obmc-host-stopping@.target b/target_files/obmc-host-stopping@.target
index 63eae4e..f60efb1 100644
--- a/target_files/obmc-host-stopping@.target
+++ b/target_files/obmc-host-stopping@.target
@@ -3,6 +3,7 @@
 After=multi-user.target
 Wants=obmc-host-stop-pre@%i.target
 After=obmc-host-stop-pre@%i.target
+Wants=obmc-host-stopped@%i.target
 Before=obmc-host-stopped@%i.target
 Conflicts=obmc-host-startmin@%i.target
 Conflicts=obmc-host-starting@%i.target
diff --git a/target_files/obmc-power-off@.target b/target_files/obmc-power-off@.target
index 59601bc..feda246 100644
--- a/target_files/obmc-power-off@.target
+++ b/target_files/obmc-power-off@.target
@@ -1,6 +1,7 @@
 [Unit]
 Description=Power%i (Off)
 After=multi-user.target
+Wants=obmc-power-stop@%i.target
 After=obmc-power-stop@%i.target
 Conflicts=obmc-chassis-poweron@%i.target
 RefuseManualStart=yes
diff --git a/target_files/obmc-power-on@.target b/target_files/obmc-power-on@.target
index a8affb2..89e9bde 100644
--- a/target_files/obmc-power-on@.target
+++ b/target_files/obmc-power-on@.target
@@ -1,6 +1,7 @@
 [Unit]
 Description=Power%i (On)
 After=multi-user.target
+Wants=obmc-power-start@%i.target
 After=obmc-power-start@%i.target
 Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
diff --git a/target_files/obmc-power-start@.target b/target_files/obmc-power-start@.target
index b3bd11e..9f28d5b 100644
--- a/target_files/obmc-power-start@.target
+++ b/target_files/obmc-power-start@.target
@@ -1,5 +1,6 @@
 [Unit]
 Description=Power%i On
+Wants=obmc-power-start-pre@%i.target
 After=obmc-power-start-pre@%i.target
 After=multi-user.target
 Conflicts=obmc-chassis-poweroff@%i.target