diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 5d309d2..317c6c1 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -1,7 +1,10 @@
 [Unit]
 Description=Start Host%i
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
-RefuseManualStart=yes
+After={SYSTEMD_DEFAULT_TARGET}
+Wants=mapper-wait@-org-openbmc-control-chassis%i.service
+After=mapper-wait@-org-openbmc-control-chassis%i.service
+Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-quiesce-host@%i.target
+OnFailureJobMode=flush