diff --git a/service_files/meson.build b/service_files/meson.build
index 31b1974..c7a380a 100644
--- a/service_files/meson.build
+++ b/service_files/meson.build
@@ -2,7 +2,6 @@
     'phosphor-systemd-target-monitor.service',
     'phosphor-discover-system-state@.service',
     'phosphor-reboot-host@.service',
-    'phosphor-reset-host-check@.service',
     'phosphor-reset-host-reboot-attempts@.service',
     'phosphor-reset-host-running@.service',
     'phosphor-reset-sensor-states@.service',
diff --git a/service_files/phosphor-reset-host-check@.service b/service_files/phosphor-reset-host-check@.service
deleted file mode 100644
index 19b217e..0000000
--- a/service_files/phosphor-reset-host-check@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Check Host%i status on BMC reset
-After=phosphor-ipmi-host.service
-After=pldmd.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/phosphor-host-check
-
-[Install]
-WantedBy=obmc-host-reset@%i.target
diff --git a/service_files/phosphor-reset-sensor-states@.service b/service_files/phosphor-reset-sensor-states@.service
index 689372f..102e969 100644
--- a/service_files/phosphor-reset-sensor-states@.service
+++ b/service_files/phosphor-reset-sensor-states@.service
@@ -1,8 +1,8 @@
 [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
+After=obmc-host-reset@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
@@ -12,4 +12,4 @@
 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
+WantedBy=multi-user.target
diff --git a/service_files/xyz.openbmc_project.State.Host.service b/service_files/xyz.openbmc_project.State.Host.service
index 123d339..50b3483 100644
--- a/service_files/xyz.openbmc_project.State.Host.service
+++ b/service_files/xyz.openbmc_project.State.Host.service
@@ -3,9 +3,13 @@
 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=mapper-wait@-xyz-openbmc_project-state-chassis0.service
+After=mapper-wait@-xyz-openbmc_project-state-chassis0.service
 Wants=obmc-mapper.target
 After=obmc-mapper.target
+After=phosphor-ipmi-host.service
+After=pldmd.service
+Before=obmc-host-reset@0.target
 
 [Service]
 ExecStart=/usr/bin/phosphor-host-state-manager