diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
index 816f6e0..bbafa3d 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
@@ -9,15 +9,20 @@
 
 CHASSIS_TARGETS = "start stop"
 POWER_TARGETS = "start-pre start on stop-pre stop off"
-HOST_TARGETS = "start-pre start started stop-pre stop stopped"
+# Track all host synchronization point target
+HOST_SYNCH_TARGETS = "start-pre start started stop-pre stop stopped"
+# Track all host action targets
+HOST_ACTION_TARGETS = "stop"
 
 CHASSIS_FMT = "obmc-chassis-{0}@.target"
 POWER_FMT = "obmc-power-{0}@.target"
-HOST_FMT = "obmc-host-{0}@.target"
+HOST_SYNCH_FMT = "obmc-host-{0}@.target"
+HOST_ACTION_FMT = "obmc-{0}-host@.target"
 
 CHASSIS_LINK_FMT = "${CHASSIS_FMT}:obmc-chassis-{0}@{1}.target"
 POWER_LINK_FMT = "${POWER_FMT}:obmc-power-{0}@{1}.target"
-HOST_LINK_FMT = "${HOST_FMT}:obmc-host-{0}@{1}.target"
+HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
+HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-{0}-host@{1}.target"
 
 SYSTEMD_SERVICE_${PN} += " \
         obmc-mapper.target \
@@ -29,8 +34,10 @@
 
 SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_FMT', 'CHASSIS_TARGETS')}"
 SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'POWER_FMT', 'POWER_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_FMT', 'HOST_TARGETS')}"
+SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}"
+SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}"
 
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_FMT', 'CHASSIS_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'POWER_LINK_FMT', 'POWER_TARGETS', 'OBMC_POWER_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_FMT', 'HOST_TARGETS', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}"
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index fcae6e9..f5b1f2d 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -3,5 +3,6 @@
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-host-start@%i.target
 Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-stop-host@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
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
new file mode 100644
index 0000000..8a5eba8
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
@@ -0,0 +1,4 @@
+[Unit]
+Description=Power%i Host Off
+Wants={SYSTEMD_DEFAULT_TARGET}
+RefuseManualStop=yes
\ No newline at end of file