diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 067f2d0..039450e 100644
--- a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -8,11 +8,13 @@
            file://start_max31785_hwmon.sh \
            "
 
-CHIPS_witherspoon = " \
+CHIPS = " \
+        bus@1e78a000/i2c-bus@100/max31785@52_air \
+        bus@1e78a000/i2c-bus@100/max31785@52_water \
+        "
+CHIPS_append_witherspoon = " \
                bus@1e78a000/i2c-bus@100/bmp280@77 \
                bus@1e78a000/i2c-bus@100/dps310@76 \
-               bus@1e78a000/i2c-bus@100/max31785@52_air \
-               bus@1e78a000/i2c-bus@100/max31785@52_water \
                bus@1e78a000/i2c-bus@100/power-supply@68 \
                bus@1e78a000/i2c-bus@100/power-supply@69 \
                bus@1e78a000/i2c-bus@140/ir35221@70 \
@@ -23,7 +25,7 @@
                "
 
 ITEMSFMT = "ahb/apb/{0}.conf"
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}"
+ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 
 OCCS_witherspoon = " \
               00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
diff --git a/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
new file mode 100644
index 0000000..cddafc1
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
@@ -0,0 +1,17 @@
+LABEL_fan1 = "fan0_0"
+CRITLO_fan1 = "3000"
+CRITHI_fan1 = "12000"
+
+LABEL_fan2 = "fan1_0"
+CRITLO_fan2 = "3000"
+CRITHI_fan2 = "12000"
+
+LABEL_fan3 = "fan2_0"
+CRITLO_fan3 = "3000"
+CRITHI_fan3 = "12000"
+
+LABEL_fan4 = "fan3_0"
+CRITLO_fan4 = "3000"
+CRITHI_fan4 = "12000"
+
+TARGET_MODE = "RPM"
diff --git a/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
new file mode 100644
index 0000000..cddafc1
--- /dev/null
+++ b/meta-witherspoon/recipes-phosphor/sensors/swift-phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
@@ -0,0 +1,17 @@
+LABEL_fan1 = "fan0_0"
+CRITLO_fan1 = "3000"
+CRITHI_fan1 = "12000"
+
+LABEL_fan2 = "fan1_0"
+CRITLO_fan2 = "3000"
+CRITHI_fan2 = "12000"
+
+LABEL_fan3 = "fan2_0"
+CRITLO_fan3 = "3000"
+CRITHI_fan3 = "12000"
+
+LABEL_fan4 = "fan3_0"
+CRITLO_fan4 = "3000"
+CRITHI_fan4 = "12000"
+
+TARGET_MODE = "RPM"