diff --git a/common/recipes-phosphor/host/obmc-op-control-host.bb b/common/recipes-phosphor/host/obmc-op-control-host.bb
index fba82d8..fa5a006 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host.bb
+++ b/common/recipes-phosphor/host/obmc-op-control-host.bb
@@ -12,11 +12,34 @@
 
 FMT = "org.openbmc.control.Host@{0}.service"
 DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_SERVICE_${PN} = "op-start-host@.service"
+SYSTEMD_SERVICE_${PN} = " \
+        op-start-host@.service \
+        op-reset-host-check@.service \
+        op-reset-host-running@.service \
+        "
 
 START_TMPL = "op-start-host@.service"
 START_TGTFMT = "obmc-chassis-start@{1}.target"
 START_INSTFMT = "obmc-start-host@{0}.service"
 START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
 
+RESET_CHECK_TMPL = "op-reset-host-check@.service"
+RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target"
+RESET_CHECK_INSTFMT = "op-reset-host-check@{0}.service"
+RESET_CHECK_FMT = "../${RESET_CHECK_TMPL}:${RESET_CHECK_TGTFMT}.requires/${RESET_CHECK_INSTFMT}"
+
+RESET_RUNNING_TMPL = "op-reset-host-running@.service"
+RESET_RUNNING_TGTFMT = "obmc-host-reset@{1}.target"
+RESET_RUNNING_INSTFMT = "op-reset-host-running@{0}.service"
+RESET_RUNNING_FMT = "../${RESET_RUNNING_TMPL}:${RESET_RUNNING_TGTFMT}.requires/${RESET_RUNNING_INSTFMT}"
+
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_CHECK_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_RUNNING_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}"
+
+# Force the standby target to run the host reset check target
+RESET_TMPL_CTRL = "obmc-host-reset@.target"
+SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}"
+RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target"
+RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}"
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
new file mode 100644
index 0000000..e3fcb04
--- /dev/null
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-check@.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Check Host%i status on BMC reset
+Wants=mapper-wait@-xyz-openbmc_project-control-host%i.service
+After=mapper-wait@-xyz-openbmc_project-control-host%i.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-stop-host@%i.target
+ConditionPathExists=/run/openbmc/chassis@%i-on
+
+[Service]
+RemainAfterExit=yes
+Type=oneshot
+ExecStart=/bin/sh -c "echo TODO - Check Host Status on BMC Reset"
+
+
+[Install]
+WantedBy=obmc-host-reset@%i.target
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
new file mode 100644
index 0000000..7f3871e
--- /dev/null
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
@@ -0,0 +1,14 @@
+[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
+# TODO: openbmc/openbmc#1205 - target name refactor
+ExecStart=/bin/systemctl start obmc-chassis-start@%i.target
+
+
+[Install]
+WantedBy=obmc-host-reset@%i.target