diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
index 21dfa6e..94bb2b1 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
@@ -1,5 +1,5 @@
 [Unit]
 Description=Host%i running after reset
-Conflicts=obmc-host-shutdown@%i.target
+Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index d823d79..6ff6809 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Reset Check)
-Conflicts=obmc-host-shutdown%i.target
+Conflicts=obmc-host-stop%i.target
 RefuseManualStop=yes
 
 [Install]
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index f1f7be1..eb0a938 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -3,6 +3,5 @@
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-host-starting@%i.target
 Conflicts=obmc-host-stop@%i.target
-Conflicts=obmc-host-shutdown@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
index ba4f0c0..f480cc5 100644
--- a/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
+++ b/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service
@@ -6,7 +6,7 @@
 Before=obmc-host-reset-running@%i.target
 Wants=op-reset-chassis-on@%i.service
 After=op-reset-chassis-on@%i.service
-Conflicts=obmc-host-shutdown@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=/run/openbmc/chassis@%i-on
 
 [Service]