diff --git a/target_files/obmc-chassis-poweroff@.target b/target_files/obmc-chassis-poweroff@.target
index 87da549..6c49764 100644
--- a/target_files/obmc-chassis-poweroff@.target
+++ b/target_files/obmc-chassis-poweroff@.target
@@ -3,6 +3,9 @@
 After=multi-user.target
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
+Wants=obmc-power-stop-pre@%i.target
+Wants=obmc-power-stop@%i.target
+Wants=obmc-power-off@%i.target
 Conflicts=obmc-chassis-poweron@%i.target
 Conflicts=obmc-chassis-powerreset@%i.target
 RefuseManualStop=yes
diff --git a/target_files/obmc-chassis-poweron@.target b/target_files/obmc-chassis-poweron@.target
index 91172b0..82bd9ad 100644
--- a/target_files/obmc-chassis-poweron@.target
+++ b/target_files/obmc-chassis-poweron@.target
@@ -4,6 +4,9 @@
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
+Wants=obmc-power-start-pre@%i.target
+Wants=obmc-power-start@%i.target
+Wants=obmc-power-on@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-chassis-poweroff@%i.target
 OnFailureJobMode=flush
diff --git a/target_files/obmc-host-startmin@.target b/target_files/obmc-host-startmin@.target
index 6820e59..609a360 100644
--- a/target_files/obmc-host-startmin@.target
+++ b/target_files/obmc-host-startmin@.target
@@ -2,6 +2,9 @@
 Description=Start Host%i Minimum
 After=multi-user.target
 Conflicts=obmc-host-stop@%i.target
+Wants=obmc-host-start-pre@%i.target
+Wants=obmc-host-starting@%i.target
+Wants=obmc-host-started@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-host-quiesce@%i.target
 OnFailureJobMode=flush
diff --git a/target_files/obmc-host-stop@.target b/target_files/obmc-host-stop@.target
index 4c8ff1b..6fc8730 100644
--- a/target_files/obmc-host-stop@.target
+++ b/target_files/obmc-host-stop@.target
@@ -3,6 +3,9 @@
 After=multi-user.target
 After=obmc-chassis-poweroff@%i.target
 Conflicts=obmc-host-startmin@%i.target
+Wants=obmc-host-stop-pre@%i.target
+Wants=obmc-host-stopping@%i.target
+Wants=obmc-host-stopped@%i.target
 RefuseManualStop=yes
 OnFailure=obmc-chassis-poweroff@%i.target
 OnFailureJobMode=flush