diff --git a/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service b/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
index 386e906..50f4189 100644
--- a/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
+++ b/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Phosphor Settings Manager
 Before=mapper-wait@-org-openbmc-settings-host0.service
+Wants=mapper-wait@-org-openbmc-control-host0.service
+After=mapper-wait@-org-openbmc-control-host0.service
 
 [Service]
 ExecStart={sbindir}/settings_manager.py
diff --git a/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service b/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
index 2a07c2b..681abb4 100644
--- a/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
+++ b/common/recipes-phosphor/system/obmc-mgr-state/obmc-mgr-state.service
@@ -2,6 +2,8 @@
 Description=Restore Last State
 Wants=obmc-mgr-state.target
 After=obmc-mgr-state.target
+Wants=mapper-wait@-org-openbmc-settings-host0.service
+After=mapper-wait@-org-openbmc-settings-host0.service
 
 [Service]
 Restart=no