diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index febbe87..aec95b8 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -1,7 +1,17 @@
 [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-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
+After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service
 Wants=clear-once.service
 After=clear-once.service
+# TODO openbmc/openbmc#2008 - remove wants/after on the old settings below
 Wants=mapper-wait@-org-openbmc-settings-host0.service
 After=mapper-wait@-org-openbmc-settings-host0.service