diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb
index 78442b8..7d437cf 100644
--- a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb
+++ b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-hwmon.bb
@@ -3,6 +3,7 @@
 PR = "r1"
 
 inherit skeleton-python
+inherit obmc-phosphor-systemd
 
 VIRTUAL-RUNTIME_skeleton_workbook ?= ""
 
@@ -16,3 +17,8 @@
         "
 
 SKELETON_DIR = "pyhwmon"
+TMPL = "mapper-wait@.service"
+TGT = "obmc-fans-ready.target"
+INSTFMT = "mapper-wait@-org-openbmc-sensors-speed-fan{0}.service"
+FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAN_INSTANCES')}"
diff --git a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb
index ca90c43..d6b416b 100644
--- a/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb
+++ b/common/recipes-phosphor/obmc-phosphor-sensor/obmc-mgr-sensor.bb
@@ -3,6 +3,7 @@
 PR = "r1"
 
 inherit skeleton-python
+inherit obmc-phosphor-dbus-service
 
 VIRTUAL-RUNTIME_skeleton_workbook ?= ""
 
@@ -15,3 +16,4 @@
         "
 
 SKELETON_DIR = "pysensormgr"
+DBUS_SERVICE_${PN} += "org.openbmc.Sensors.service"