diff --git a/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
index 7dc09d3..4e34396 100644
--- a/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -6,6 +6,7 @@
 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
 
 [Service]
 Restart=no
diff --git a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index 3b8551b..9adeed9 100644
--- a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -5,6 +5,7 @@
 Wants=mapper-wait@-org-openbmc-managers-System.service
 After=mapper-wait@-org-openbmc-managers-System.service
 Before=mapper-wait@-xyz-openbmc_project-state-host.service
+After=phosphor-reset-host-running@0.service
 
 [Service]
 ExecStart={sbindir}/phosphor-host-state-manager