diff --git a/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
index 91ceff9..563ed26 100644
--- a/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
+++ b/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
@@ -47,7 +47,8 @@
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service"
 
-RRECOMMENDS_${PN} += "virtual-obmc-settings-mgmt"
+RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
+
 
 require ${PN}.inc
 
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 a70b272..3f10e11 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
@@ -11,9 +11,6 @@
 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
 
 [Service]
 Restart=always