diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
index c8eda8a..c54fea6 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
@@ -6,3 +6,5 @@
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-chassis-stop@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-quiesce-host@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
index aeac3d6..0fccea2 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
@@ -6,3 +6,5 @@
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-chassis-start@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-power-chassis-off@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
index f9571b1..32250a4 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
@@ -6,3 +6,5 @@
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-power-chassis-off@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-power-chassis-off@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
index 8a5eba8..4347fa4 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
@@ -1,4 +1,6 @@
 [Unit]
 Description=Power%i Host Off
 Wants={SYSTEMD_DEFAULT_TARGET}
-RefuseManualStop=yes
\ No newline at end of file
+RefuseManualStop=yes
+OnFailure=obmc-chassis-stop@%i.target
+OnFailureJobMode=flush