diff --git a/target_files/obmc-chassis-poweron@.target b/target_files/obmc-chassis-poweron@.target
index 74547a2..93c5a31 100644
--- a/target_files/obmc-chassis-poweron@.target
+++ b/target_files/obmc-chassis-poweron@.target
@@ -8,4 +8,4 @@
 Wants=obmc-power-start@%i.target
 Wants=obmc-power-on@%i.target
 OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail
diff --git a/target_files/obmc-host-reboot@.target b/target_files/obmc-host-reboot@.target
index be3522c..b72698d 100644
--- a/target_files/obmc-host-reboot@.target
+++ b/target_files/obmc-host-reboot@.target
@@ -3,4 +3,4 @@
 After=multi-user.target
 Conflicts=obmc-host-startmin@%i.target
 OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail
diff --git a/target_files/obmc-host-shutdown@.target b/target_files/obmc-host-shutdown@.target
index 3689062..e9e4a39 100644
--- a/target_files/obmc-host-shutdown@.target
+++ b/target_files/obmc-host-shutdown@.target
@@ -2,4 +2,4 @@
 Description=Power%i Host Off
 After=multi-user.target
 OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail
diff --git a/target_files/obmc-host-start@.target b/target_files/obmc-host-start@.target
index 6d7a99c..ffe39f8 100644
--- a/target_files/obmc-host-start@.target
+++ b/target_files/obmc-host-start@.target
@@ -3,4 +3,4 @@
 After=multi-user.target
 Conflicts=obmc-host-stop@%i.target
 OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail
diff --git a/target_files/obmc-host-startmin@.target b/target_files/obmc-host-startmin@.target
index 7324d57..0d59d15 100644
--- a/target_files/obmc-host-startmin@.target
+++ b/target_files/obmc-host-startmin@.target
@@ -6,4 +6,4 @@
 Wants=obmc-host-starting@%i.target
 Wants=obmc-host-started@%i.target
 OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail
diff --git a/target_files/obmc-host-stop@.target b/target_files/obmc-host-stop@.target
index 10c4456..c644dbc 100644
--- a/target_files/obmc-host-stop@.target
+++ b/target_files/obmc-host-stop@.target
@@ -7,4 +7,4 @@
 Wants=obmc-host-stopping@%i.target
 Wants=obmc-host-stopped@%i.target
 OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
+OnFailureJobMode=fail