diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index 28357d1..3557b74 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:"
 
 # More conf files can be added as sensors are added.
 
 ITEMS = "pwm-tacho-controller@1e786000.conf"
 
 TEMPS = "tmp75@4c tmp75@4e tmp75@4f"
-TEMPBASE = "apb/i2c@1e78a000/i2c-bus@80/{0}.conf"
+TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf"
 ITEMS += "${@compose_list(d, 'TEMPBASE', 'TEMPS')}"
 
-ENVS = "obmc/hwmon/ahb/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
+ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'ITEMS')}"
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/pwm-tacho-controller@1e786000.conf b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/pwm-tacho-controller@1e786000.conf
rename to meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/pwm-tacho-controller@1e786000.conf