diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
index 69043f0..3435816 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
@@ -3,9 +3,12 @@
 HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd"
 PR = "r1"
 
+inherit allarch
 inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
 inherit setuptools
+inherit obmc-phosphor-dbus-service
+
+DBUS_SERVICE_${PN} = "org.openbmc.settings.Host.service"
 
 DEPENDS += "python-pyyaml-native"
 RDEPENDS_${PN} += "python-dbus python-pygobject"
@@ -17,4 +20,3 @@
 SRCREV = "c1e5e9ffb9df84c0f0fdb41e604d1738b6f9bc45"
 
 S = "${WORKDIR}/git"
-
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
old mode 100755
new mode 100644
similarity index 69%
rename from meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service
rename to meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
index b88cf04..386e906
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/org.openbmc.settings.Host.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=Phosphor Settings Manager
+Before=mapper-wait@-org-openbmc-settings-host0.service
 
 [Service]
 ExecStart={sbindir}/settings_manager.py
 Environment="PYTHONUNBUFFERED=1"
 Restart=always
+Type=dbus
+BusName={BUSNAME}
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}