diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
index 5224c98..057af64 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Phosphor BMC State Manager
-Wants=mapper-wait@-org-openbmc-managers-System.service
-After=mapper-wait@-org-openbmc-managers-System.service
 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
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
index 9a467eb..aaaa9e0 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Phosphor Chassis State Manager
-Wants=mapper-wait@-org-openbmc-managers-System.service
-After=mapper-wait@-org-openbmc-managers-System.service
 Before=mapper-wait@-xyz-openbmc_project-state-chassis.service
+Wants=obmc-mapper.target
+After=obmc-mapper.target
+
 
 [Service]
 ExecStart=/usr/bin/env phosphor-chassis-state-manager
diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
index a70257e..26f523e 100644
--- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
+++ b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service
@@ -2,10 +2,10 @@
 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
-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
+Wants=obmc-mapper.target
+After=obmc-mapper.target
 
 [Service]
 ExecStart=/usr/bin/env phosphor-host-state-manager