diff --git a/recipes-core/systemd/obmc-targets.bb b/recipes-core/systemd/obmc-targets.bb
index 4146dba..2ab0c22 100644
--- a/recipes-core/systemd/obmc-targets.bb
+++ b/recipes-core/systemd/obmc-targets.bb
@@ -5,86 +5,5 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-inherit obmc-phosphor-systemd
-inherit allarch
-
-# Chassis power synchronization targets
-# - start-pre:         Services to run before we start power on process
-# - start:             Services to run to do the chassis power on
-# - on:                Services to run once power is on
-# - stop-pre,stop,off: Same as above but applied to powering off
-# - reset-on:          Services to check if chassis power is on after bmc reset
-CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on"
-
-# Chassis action power targets
-# - on:  Services to run to power on the chassis
-# - off: Services to run to power off the chassis
-# - powered-off: Services to run once chassis power is off
-# - reset: Services to check chassis power state and update chassis "on" target
-# - hard-off: Services to force an immediate power off of the chassis
-CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff"
-
-# Track all host synchronization point targets
-# - start-pre:                 Services to run before we start host boot
-# - starting:                  Services to run to do the host boot
-# - started:                   Services to run once the host is booted
-# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host
-# - reset-running:             Services to check if host is running after bmc reset
-HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running"
-
-# Track all host action targets
-# - start:    Will run startmin target, this target used for any additional
-#             services that user needs for an initial power on of host.
-#             For example, resetting the host reboot count could be put in
-#             this target so on any fresh power on, this count is reset.
-# - startmin: Minimum services required to start the host. This target will
-#             be called by reboot and start target.
-# - stop:     Services to run to shutdown the host
-# - quiesce:  Target to enter on host boot failure
-# - shutdown: Tell host to shutdown, then stop system
-# - reset:   Services to check if host is running and update host "start" target
-# - crash:   Target to run when host crashes. it is very much similar to
-#            quiesce target but the only delta is that this target contains
-#            multiple services and one of them is the quiesce target.
-# - timeout: Target to run when host watchdog times out
-# - reboot:  Reboot the host
-HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout reboot"
-
-CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target"
-CHASSIS_ACTION_FMT = "obmc-chassis-{0}@.target"
-HOST_SYNCH_FMT = "obmc-host-{0}@.target"
-HOST_ACTION_FMT = "obmc-host-{0}@.target"
-
-CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target"
-CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-{0}@{1}.target"
-HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
-HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target"
-FAN_LINK_FMT = "obmc-fan-control-ready@.target:obmc-fan-control-ready@{0}.target"
-
-# Targets to be executed on checkstop and watchdog timeout
-HOST_ERROR_TARGETS = "crash timeout"
-
-QUIESCE_TMPL = "obmc-host-quiesce@.target"
-CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target"
-QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target"
-QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += " \
-        obmc-mapper.target \
-        obmc-fans-ready.target \
-        obmc-fan-control.target \
-        obmc-fan-control-ready@.target \
-        obmc-fan-watchdog-takeover.target \
-        "
-
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_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_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_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')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}"
+# TODO Will be removed once dependencies in other layers on this recipe are moved
+DEPENDS += "phosphor-state-manager"
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
deleted file mode 100644
index a033f60..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Chassis%i (Hard Power Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-Conflicts=obmc-host-shutdown@%i.target
-Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
deleted file mode 100644
index c043f37..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Powered Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
deleted file mode 100644
index 69209e6..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Chassis%i (Power Off)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-powerreset@%i.target
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
deleted file mode 100644
index cd7c2fc..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Chassis%i (Power On)
-Wants=multi-user.target
-After=multi-user.target
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
deleted file mode 100644
index 03036f3..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Chassis%i (Reset Check)
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
deleted file mode 100644
index e041a55..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control Ready
-RefuseManualStop=yes
-Conflicts=obmc-chassis-powered-off@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/recipes-core/systemd/obmc-targets/obmc-fan-control.target
deleted file mode 100644
index 50665db..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-fan-control.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fan Control
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
deleted file mode 100644
index 8034083..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target
+++ /dev/null
@@ -1,6 +0,0 @@
-#The system implementation should start this target when dynamic fan control
-#is no longer desired or possible.  It should also add units to this target
-#that enabled continued operation after dynamic fan control is no longer
-#desired or possible.
-[Unit]
-Description=Fan watchdog takeover target
diff --git a/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
deleted file mode 100644
index 59e61c6..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-fans-ready.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Fans Ready
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
deleted file mode 100644
index ea3798b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-crash@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i crashed
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
deleted file mode 100644
index 900995b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Quiesce Target
-Wants=multi-user.target
-After=multi-user.target
-RefuseManualStop=yes
-Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
deleted file mode 100644
index 8e749e6..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Reboot Host%i
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
deleted file mode 100644
index 94bb2b1..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Host%i running after reset
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
deleted file mode 100644
index 84d8701..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Reset Check)
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
deleted file mode 100644
index 012d364..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Power%i Host Off
-Wants=multi-user.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
deleted file mode 100644
index fe55146..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Start Host%i (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/recipes-core/systemd/obmc-targets/obmc-host-start@.target
deleted file mode 100644
index ff1486b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Start Host%i
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/recipes-core/systemd/obmc-targets/obmc-host-started@.target
deleted file mode 100644
index fcd51be..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Started)
-Wants=multi-user.target
-After=obmc-host-starting@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
deleted file mode 100644
index 52e7bea..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Host%i (Starting)
-Wants=multi-user.target
-After=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
deleted file mode 100644
index 88ccb25..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Start Host%i Minimum
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-host-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-host-quiesce@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
deleted file mode 100644
index 9fc3296..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Stop Host%i (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Before=obmc-host-stopping@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
deleted file mode 100644
index 496fd5b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Stop Host%i
-Wants=multi-user.target
-After=multi-user.target
-After=obmc-chassis-poweroff@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
deleted file mode 100644
index c968979..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Host%i (Stopped)
-Wants=multi-user.target
-Wants=obmc-host-stopping@%i.target
-After=obmc-host-stopping@%i.target
-Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-host-startmin@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
deleted file mode 100644
index 41c4b7f..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Host%i (Stopping)
-Wants=multi-user.target
-Wants=obmc-host-stop-pre@%i.target
-After=obmc-host-stop-pre@%i.target
-Before=obmc-host-stopped@%i.target
-Conflicts=obmc-host-startmin@%i.target
-Conflicts=obmc-host-starting@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
deleted file mode 100644
index b87507b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Host instance %i timed out refreshing Watchdog
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-mapper.target b/recipes-core/systemd/obmc-targets/obmc-mapper.target
deleted file mode 100644
index 5e52f4c..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-mapper.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Phosphor Object Mapper
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/recipes-core/systemd/obmc-targets/obmc-power-off@.target
deleted file mode 100644
index 7fda29b..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (Off)
-Wants=multi-user.target
-After=obmc-power-stop@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/recipes-core/systemd/obmc-targets/obmc-power-on@.target
deleted file mode 100644
index b55d909..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i (On)
-Wants=multi-user.target
-After=obmc-power-start@%i.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
deleted file mode 100644
index d24d401..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Chassis%i power on after reset
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
deleted file mode 100644
index 2b5fdbb..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/recipes-core/systemd/obmc-targets/obmc-power-start@.target
deleted file mode 100644
index 720548e..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Power%i On
-After=obmc-power-start-pre@%i.target
-Wants=multi-user.target
-Conflicts=obmc-chassis-poweroff@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
deleted file mode 100644
index 5460914..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off (Pre)
-Wants=multi-user.target
-After=multi-user.target
-Wants=obmc-host-stopped@%i.target
-After=obmc-host-stopped@%i.target
-Conflicts=obmc-chassis-poweron@%i.target
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
deleted file mode 100644
index fc22eb1..0000000
--- a/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Power%i Off
-Wants=obmc-power-stop-pre@%i.target
-After=obmc-power-stop-pre@%i.target
-Wants=multi-user.target
-Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=fsi-disable.service
-RefuseManualStart=yes
-RefuseManualStop=yes
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
index a813a45..de1aa2e 100644
--- a/recipes-core/systemd/systemd_%.bbappend
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -8,7 +8,6 @@
 SRC_URI += "file://default.network"
 SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch"
 
-RRECOMMENDS_${PN} += "obmc-targets"
 FILES_${PN} += "${systemd_unitdir}/network/default.network"
 
 do_install_append() {
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index e41da0b..6bd95e8 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -23,7 +23,7 @@
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "nlohmann-json"
-DEPENDS += "obmc-targets"
+DEPENDS += "phosphor-state-manager"
 DEPENDS += "${@ipmi_whitelists(d)}"
 DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "phosphor-logging"
diff --git a/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf b/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
deleted file mode 100644
index 2e3ca1a..0000000
--- a/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf
+++ /dev/null
@@ -1 +0,0 @@
-REBOOT_DELAY=5
diff --git a/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/recipes-phosphor/state/files/phosphor-discover-system-state@.service
deleted file mode 100644
index 4a5e6a7..0000000
--- a/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Reboot If Enabled
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=op-reset-chassis-on@%i.service
-ConditionPathExists=!/run/openbmc/chassis@%i-on
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/usr/bin/env phosphor-discover-system-state --host %i
-SyslogIdentifier=phosphor-discover-system-state
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/phosphor-reboot-host@.service b/recipes-phosphor/state/files/phosphor-reboot-host@.service
deleted file mode 100644
index 27479f2..0000000
--- a/recipes-phosphor/state/files/phosphor-reboot-host@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Reboot host%i
-Wants=obmc-host-stop@%i.target
-After=obmc-host-stop@%i.target
-
-[Service]
-#ExecStart={base_bindir}/systemctl start obmc-host-start@%i.target
-# This service is starting another target that conflicts with the
-# target this service is running in. OpenBMC needs a refactor of
-# how it does its host reset path. Until then, this short term
-# solution does the job.
-# Since this is a part of the reboot target, call the startmin
-# target which does the minimum required to start the host.
-ExecStart=/bin/sh -c "sleep ${{REBOOT_DELAY}} && systemctl start obmc-host-startmin@%i.target"
-EnvironmentFile={envfiledir}/obmc/phosphor-reboot-host/reboot.conf
-
-[Install]
-WantedBy=obmc-host-reboot@%i.target
diff --git a/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/recipes-phosphor/state/files/phosphor-reset-host-check@.service
deleted file mode 100644
index 075ac50..0000000
--- a/recipes-phosphor/state/files/phosphor-reset-host-check@.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Check Host%i status on BMC reset
-Wants=phosphor-ipmi-host.service
-After=phosphor-ipmi-host.service
-Wants=obmc-host-reset-running@%i.target
-Before=obmc-host-reset-running@%i.target
-Wants=op-reset-chassis-on@%i.service
-After=op-reset-chassis-on@%i.service
-Conflicts=obmc-host-stop@%i.target
-ConditionPathExists=/run/openbmc/chassis@%i-on
-
-[Service]
-RemainAfterExit=yes
-Type=oneshot
-ExecStart=/usr/bin/env phosphor-host-check
-SyslogIdentifier=phosphor-host-check
-
-[Install]
-WantedBy=obmc-host-reset@%i.target
diff --git a/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
deleted file mode 100644
index 35de430..0000000
--- a/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Reset host reboot counter
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-ConditionPathExists=!/run/openbmc/host@%i-on
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 3"
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/recipes-phosphor/state/files/phosphor-reset-host-running@.service b/recipes-phosphor/state/files/phosphor-reset-host-running@.service
deleted file mode 100644
index a49bbdd..0000000
--- a/recipes-phosphor/state/files/phosphor-reset-host-running@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Start host%i running after BMC reset
-After=obmc-host-reset-running@%i.target
-Requires=obmc-host-reset-running@%i.target
-ConditionPathExists=/run/openbmc/host@%i-on
-
-[Service]
-RemainAfterExit=no
-ExecStart=/bin/systemctl start obmc-host-start@%i.target
-
-
-[Install]
-WantedBy=obmc-host-reset@%i.target
diff --git a/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service b/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
deleted file mode 100644
index 689372f..0000000
--- a/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Reset host sensors
-After=phosphor-reset-host-check@%i.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
-ConditionPathExists=!/run/openbmc/host@%i-on
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host0` /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Boot.Progress  BootProgress s xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified"
-ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host0` /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive"
-
-[Install]
-WantedBy=obmc-host-reset@%i.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
deleted file mode 100644
index de1da5a..0000000
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Phosphor BMC State Manager
-Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
-
-
-[Service]
-ExecStart=/usr/bin/env phosphor-bmc-state-manager
-SyslogIdentifier=phosphor-bmc-state-manager
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
deleted file mode 100644
index 1cab07f..0000000
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Phosphor Chassis State Manager
-Before=mapper-wait@-xyz-openbmc_project-state-chassis.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
-After=org.openbmc.control.Power@0.service
-
-[Service]
-ExecStart=/usr/bin/env phosphor-chassis-state-manager
-SyslogIdentifier=phosphor-chassis-state-manager
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
deleted file mode 100644
index 780f260..0000000
--- a/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Phosphor Host State Manager
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service
-Before=mapper-wait@-xyz-openbmc_project-state-host.service
-After=phosphor-reset-host-running@0.service
-Wants=obmc-mapper.target
-After=obmc-mapper.target
-
-[Service]
-ExecStart=/usr/bin/env phosphor-host-state-manager
-SyslogIdentifier=phosphor-host-state-manager
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-phosphor/state/phosphor-state-manager_git.bb b/recipes-phosphor/state/phosphor-state-manager_git.bb
index 674add7..caa0352 100644
--- a/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -16,6 +16,7 @@
     ${PN}-host-check \
     ${PN}-reset-sensor-states \
     ${PN}-systemd-target-monitor \
+    ${PN}-obmc-targets \
 "
 PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}"
 ALLOW_EMPTY_${PN} = "1"
@@ -35,6 +36,9 @@
 # recommended to deal properly with these reset scenarios.
 RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states"
 
+# The obmc-targets are the base targets required to boot a computer system
+RRECOMMENDS_${PN}-host += "${PN}-obmc-targets"
+
 inherit meson pkgconfig
 inherit obmc-phosphor-dbus-service
 
@@ -49,7 +53,6 @@
 FILES_${PN}-host = "${bindir}/phosphor-host-state-manager"
 DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service"
 DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-host += "obmc/phosphor-reboot-host/reboot.conf"
 SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service"
 
 FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager"
@@ -140,7 +143,89 @@
 HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}"
 SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}"
 
+
+# Chassis power synchronization targets
+# - start-pre:         Services to run before we start power on process
+# - start:             Services to run to do the chassis power on
+# - on:                Services to run once power is on
+# - stop-pre,stop,off: Same as above but applied to powering off
+# - reset-on:          Services to check if chassis power is on after bmc reset
+CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on"
+
+# Chassis action power targets
+# - on:  Services to run to power on the chassis
+# - off: Services to run to power off the chassis
+# - powered-off: Services to run once chassis power is off
+# - reset: Services to check chassis power state and update chassis "on" target
+# - hard-off: Services to force an immediate power off of the chassis
+CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff"
+
+# Track all host synchronization point targets
+# - start-pre:                 Services to run before we start host boot
+# - starting:                  Services to run to do the host boot
+# - started:                   Services to run once the host is booted
+# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host
+# - reset-running:             Services to check if host is running after bmc reset
+HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running"
+
+# Track all host action targets
+# - start:    Will run startmin target, this target used for any additional
+#             services that user needs for an initial power on of host.
+#             For example, resetting the host reboot count could be put in
+#             this target so on any fresh power on, this count is reset.
+# - startmin: Minimum services required to start the host. This target will
+#             be called by reboot and start target.
+# - stop:     Services to run to shutdown the host
+# - quiesce:  Target to enter on host boot failure
+# - shutdown: Tell host to shutdown, then stop system
+# - reset:   Services to check if host is running and update host "start" target
+# - crash:   Target to run when host crashes. it is very much similar to
+#            quiesce target but the only delta is that this target contains
+#            multiple services and one of them is the quiesce target.
+# - timeout: Target to run when host watchdog times out
+# - reboot:  Reboot the host
+HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout reboot"
+
+CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target"
+CHASSIS_ACTION_FMT = "obmc-chassis-{0}@.target"
+HOST_SYNCH_FMT = "obmc-host-{0}@.target"
+HOST_ACTION_FMT = "obmc-host-{0}@.target"
+
+CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target"
+CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-{0}@{1}.target"
+HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
+HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target"
+FAN_LINK_FMT = "obmc-fan-control-ready@.target:obmc-fan-control-ready@{0}.target"
+
+# Targets to be executed on checkstop and watchdog timeout
+HOST_ERROR_TARGETS = "crash timeout"
+
+QUIESCE_TMPL = "obmc-host-quiesce@.target"
+CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target"
+QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target"
+QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}"
+
+SYSTEMD_SERVICE_${PN}-obmc-targets += " \
+        obmc-mapper.target \
+        obmc-fans-ready.target \
+        obmc-fan-control.target \
+        obmc-fan-control-ready@.target \
+        obmc-fan-watchdog-takeover.target \
+        "
+
+SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}"
+SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}"
+SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}"
+SYSTEMD_SERVICE_${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}"
+
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}"
+
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "4640d48e998709f1b64b97347db0f1b355b7f423"
+SRCREV = "c101157e5b138f36044a2a3aaf15ad8ac16501fc"
 
 S = "${WORKDIR}/git"