diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 1e5e3ac..455e950 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -29,7 +29,7 @@
 RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control phosphor-gpio-monitor-presence entity-manager"
 RDEPENDS:${PN}-inventory:append:witherspoon-tacoma = " entity-manager"
 RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog"
-RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor"
+RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog phosphor-fan-sensor-monitor"
 RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync"
 RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} dbus-sensors phosphor-virtual-sensor"
 RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger libmctp"
diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
index d9fbf41..346b583 100644
--- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
+++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb
@@ -90,8 +90,8 @@
 SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \
                                 compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_ZERO_ONLY'), \
                                 compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_ZERO_ONLY'), d)}"
-SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service"
-SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service"
+SYSTEMD_SERVICE:${PN}-sensor-monitor += "sensor-monitor.service"
+SYSTEMD_LINK:${PN}-sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service"
 
 inherit meson pkgconfig python3native
 inherit obmc-phosphor-systemd
@@ -114,7 +114,7 @@
 # Package the JSON config files installed from the repo
 FILES:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \
     '${datadir}/phosphor-fan-presence/monitor/*', '', d)}"
-FILES:sensor-monitor += " ${bindir}/sensor-monitor"
+FILES:${PN}-sensor-monitor += " ${bindir}/sensor-monitor"
 
 require ${BPN}.inc
 
@@ -153,4 +153,3 @@
 TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service"
 INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service"
 FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}"
-FAN_PACKAGES:append = "${@bb.utils.contains('PACKAGECONFIG', 'sensor-monitor', ' sensor-monitor', '', d)}"