diff --git a/common/recipes-phosphor/network/network.bb b/common/recipes-phosphor/network/network.bb
index aee8dd3..23459d9 100644
--- a/common/recipes-phosphor/network/network.bb
+++ b/common/recipes-phosphor/network/network.bb
@@ -4,10 +4,10 @@
 PR = "r1"
 
 inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-inherit obmc-phosphor-sdbus-service
+inherit obmc-phosphor-dbus-service
 
-SYSTEMD_SERVICE_${PN} += "network.service network-update-dns.service"
+DBUS_SERVICE_${PN} += "org.openbmc.NetworkManager.service"
+SYSTEMD_SERVICE_${PN} += "network-update-dns.service"
 
 RDEPENDS_${PN} += "python-dbus python-pygobject python-ipy"
 
@@ -17,7 +17,7 @@
 
 S = "${WORKDIR}/git"
 
-do_install() {
+do_install_append() {
         install -d ${D}/${sbindir}
         install ${S}/netman.py ${D}/${sbindir}
         install ${S}/netman_watch_dns ${D}/${sbindir}
diff --git a/common/recipes-phosphor/network/network/network-update-dns.service b/common/recipes-phosphor/network/network/network-update-dns.service
index 3d45838..3044903 100644
--- a/common/recipes-phosphor/network/network/network-update-dns.service
+++ b/common/recipes-phosphor/network/network/network-update-dns.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Phosphor DNS Settings Cache Manager
-Requires=network.service
-After=network.service
+Wants=mapper-wait@-org-openbmc-NetworkManager-Interface.service
+After=mapper-wait@-org-openbmc-NetworkManager-Interface.service
 
 [Service]
 ExecStart={sbindir}/netman_watch_dns /run/systemd/netif/state
diff --git a/common/recipes-phosphor/network/network/network.service b/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
similarity index 86%
rename from common/recipes-phosphor/network/network/network.service
rename to common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
index a02214c..5ca1f82 100644
--- a/common/recipes-phosphor/network/network/network.service
+++ b/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service
@@ -5,6 +5,8 @@
 ExecStart={sbindir}/netman.py
 Environment="PYTHONUNBUFFERED=1"
 Restart=always
+Type=dbus
+BusName={BUSNAME}
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}