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 325e8dc..7dc09d3 100644
--- a/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
+++ b/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Reboot If Enabled
-Wants=mapper-wait@-org-openbmc-settings-host%i.service
-After=mapper-wait@-org-openbmc-settings-host%i.service
+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