diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-host-state-monitor.service b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-host-state-monitor.service
index bba0dc0..27fa0f0 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-host-state-monitor.service
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-host-state-monitor.service
@@ -1,43 +1,31 @@
 [Unit]
 Description=Bletchley host state monitoring
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis1.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis1.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis2.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis2.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis3.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis3.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis4.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis4.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis5.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis5.service
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis6.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis6.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host1.service
-After=mapper-wait@-xyz-openbmc_project-state-host1.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host2.service
-After=mapper-wait@-xyz-openbmc_project-state-host2.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host3.service
-After=mapper-wait@-xyz-openbmc_project-state-host3.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host4.service
-After=mapper-wait@-xyz-openbmc_project-state-host4.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host5.service
-After=mapper-wait@-xyz-openbmc_project-state-host5.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host6.service
-After=mapper-wait@-xyz-openbmc_project-state-host6.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host6.service
-After=mapper-wait@-xyz-openbmc_project-state-host6.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host1-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host1-acpi_power_state.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host2-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host2-acpi_power_state.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host3-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host3-acpi_power_state.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host4-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host4-acpi_power_state.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host5-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host5-acpi_power_state.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host6-acpi_power_state.service
-After=mapper-wait@-xyz-openbmc_project-control-host6-acpi_power_state.service
+Wants=xyz.openbmc_project.State.Chassis@1.service
+After=xyz.openbmc_project.State.Chassis@1.service
+Wants=xyz.openbmc_project.State.Chassis@2.service
+After=xyz.openbmc_project.State.Chassis@2.service
+Wants=xyz.openbmc_project.State.Chassis@3.service
+After=xyz.openbmc_project.State.Chassis@3.service
+Wants=xyz.openbmc_project.State.Chassis@4.service
+After=xyz.openbmc_project.State.Chassis@4.service
+Wants=xyz.openbmc_project.State.Chassis@5.service
+After=xyz.openbmc_project.State.Chassis@5.service
+Wants=xyz.openbmc_project.State.Chassis@6.service
+After=xyz.openbmc_project.State.Chassis@6.service
+Wants=xyz.openbmc_project.State.Host@1.service
+After=xyz.openbmc_project.State.Host@1.service
+Wants=xyz.openbmc_project.State.Host@2.service
+After=xyz.openbmc_project.State.Host@2.service
+Wants=xyz.openbmc_project.State.Host@3.service
+After=xyz.openbmc_project.State.Host@3.service
+Wants=xyz.openbmc_project.State.Host@4.service
+After=xyz.openbmc_project.State.Host@4.service
+Wants=xyz.openbmc_project.State.Host@5.service
+After=xyz.openbmc_project.State.Host@5.service
+Wants=xyz.openbmc_project.State.Host@6.service
+After=xyz.openbmc_project.State.Host@6.service
+Wants=xyz.openbmc_project.Settings.service
+After=xyz.openbmc_project.Settings.service
 
 [Service]
 ExecStart=/usr/libexec/bletchley-host-state-monitor
diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/files/bletchley-system-state-init@.service b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/files/bletchley-system-state-init@.service
index 0c98209..540297e 100644
--- a/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/files/bletchley-system-state-init@.service
+++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-tools/files/bletchley-system-state-init@.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Bletchley host state and chassis power state initialize for sled%i
-Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service
-After=mapper-wait@-xyz-openbmc_project-state-host%i.service
+Wants=xyz.openbmc_project.State.Chassis@%i.service
+After=xyz.openbmc_project.State.Chassis@%i.service
+Wants=xyz.openbmc_project.State.Host@%i.service
+After=xyz.openbmc_project.State.Host@%i.service
 
 [Service]
 ExecStart=/usr/libexec/bletchley-system-state-init %i