diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index 0cccfcd..a70b272 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Phosphor Inband IPMI
 # TODO openbmc/openbmc#2059 - The wants/after below should be based on providers
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot_mode.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-boot_mode.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot_source.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-boot_source.service
+Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot.service
+After=mapper-wait@-xyz-openbmc_project-control-host0-boot.service
+Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service
+After=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.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-control-host0-restriction_mode.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
index 3d346c5..b1f51dc 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Network IPMI daemon
 # TODO openbmc/openbmc#2059 - The wants/after below should be based on providers
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot_mode.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-boot_mode.service
-Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot_source.service
-After=mapper-wait@-xyz-openbmc_project-control-host0-boot_source.service
+Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot.service
+After=mapper-wait@-xyz-openbmc_project-control-host0-boot.service
+Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service
+After=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.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-control-host0-restriction_mode.service