diff --git a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
index efe9cd5..d0dbd60 100644
--- a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
+++ b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb
@@ -6,10 +6,6 @@
 inherit allarch
 inherit mrw-xml
 
-EXTRA_SRC_URI = ""
-EXTRA_SRC_URI_witherspoon = " \
-    file://ac922-ipmi-extra-hwmon-sensors.yaml \
-    "
 SRC_URI = " \
     file://acx22-ipmi-fru-bmc.yaml \
     file://acx22-ipmi-fru-not-sent-by-host.yaml \
@@ -17,7 +13,6 @@
     file://acx22-ipmi-inventory-sensors.yaml \
     file://acx22-ipmi-occ-sensors.yaml \
     file://acx22-ipmi-sensors-mrw.yaml \
-    ${EXTRA_SRC_URI} \
     "
 
 DEPENDS = " \
@@ -32,14 +27,9 @@
     acx22-ipmi-fru-bmc.yaml \
     acx22-ipmi-fru-not-sent-by-host.yaml \
     "
-ACx22_IPMI_EXTRA_MACHINE_SENSOR_YAMLS = ""
-ACx22_IPMI_EXTRA_MACHINE_SENSOR_YAMLS_witherspoon = " \
-    ac922-ipmi-extra-hwmon-sensors.yaml \
-    "
 ACx22_IPMI_EXTRA_SENSOR_YAMLS = " \
     acx22-ipmi-hwmon-sensors.yaml \
     acx22-ipmi-occ-sensors.yaml \
-    ${ACx22_IPMI_EXTRA_MACHINE_SENSOR_YAMLS} \
     "
 
 do_install() {
diff --git a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml
similarity index 94%
rename from meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml
rename to meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml
index 6d22a61..38f3835 100644
--- a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml
+++ b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml
@@ -1,4 +1,4 @@
-221:
+232:
     bExp: 0
     entityID: 29
     entityInstance: 1
@@ -19,7 +19,7 @@
     sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-223:
+233:
     bExp: 0
     entityID: 29
     entityInstance: 3
@@ -40,7 +40,7 @@
     sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-227:
+234:
     bExp: 0
     entityID: 29
     entityInstance: 5
@@ -61,7 +61,7 @@
     sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-229:
+235:
     bExp: 0
     entityID: 29
     entityInstance: 7
@@ -82,7 +82,7 @@
     sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-231:
+236:
     bExp: 0
     entityID: 10
     entityInstance: 1
@@ -103,7 +103,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-238:
+237:
     bExp: 0
     entityID: 10
     entityInstance: 9
@@ -124,7 +124,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-239:
+238:
     bExp: 0
     entityID: 10
     entityInstance: 10
@@ -145,7 +145,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-240:
+239:
     bExp: 0
     entityID: 10
     entityInstance: 11
@@ -166,7 +166,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-241:
+240:
     bExp: 0
     entityID: 10
     entityInstance: 12
@@ -187,7 +187,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-242:
+241:
     bExp: 0
     entityID: 10
     entityInstance: 13
@@ -208,7 +208,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-243:
+242:
     bExp: 0
     entityID: 10
     entityInstance: 14
@@ -229,7 +229,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-244:
+243:
     bExp: 0
     entityID: 10
     entityInstance: 15
@@ -250,7 +250,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-245:
+244:
     bExp: 0
     entityID: 10
     entityInstance: 16
@@ -271,7 +271,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-246:
+245:
     bExp: 0
     entityID: 10
     entityInstance: 17
@@ -292,7 +292,7 @@
     sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
-247:
+246:
     bExp: 0
     entityID: 10
     entityInstance: 19
@@ -313,7 +313,7 @@
     sensorType: 2
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-248:
+247:
     bExp: 0
     entityID: 10
     entityInstance: 20
@@ -334,7 +334,7 @@
     sensorType: 2
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-249:
+248:
     bExp: 0
     entityID: 10
     entityInstance: 21
@@ -355,7 +355,7 @@
     sensorType: 2
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-250:
+249:
     bExp: 0
     entityID: 10
     entityInstance: 22
@@ -376,7 +376,7 @@
     sensorType: 2
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
-251:
+250:
     bExp: 0
     entityID: 10
     entityInstance: 23
@@ -397,7 +397,7 @@
     sensorType: 3
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
-252:
+251:
     bExp: 0
     entityID: 10
     entityInstance: 24
@@ -418,7 +418,7 @@
     sensorType: 3
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
-253:
+252:
     bExp: 0
     entityID: 35
     entityInstance: 1
@@ -430,7 +430,28 @@
                         type: int64_t
     multiplierM: 30
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/temperature/pcie
+    path: /xyz/openbmc_project/sensors/temperature/pcie0_1
+    rExp: -2
+    readingType: readingData
+    scale: -3
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 1
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+253:
+    bExp: 0
+    entityID: 35
+    entityInstance: 2
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 30
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/temperature/pcie2_3
     rExp: -2
     readingType: readingData
     scale: -3
@@ -451,7 +472,7 @@
                         type: int64_t
     multiplierM: 20
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/temperature/ambient
+    path: /xyz/openbmc_project/sensors/temperature/ambient0
     rExp: -2
     readingType: readingData
     scale: -3
@@ -460,3 +481,4 @@
     sensorType: 1
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+
diff --git a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/ac922-ipmi-extra-hwmon-sensors.yaml b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/ac922-ipmi-extra-hwmon-sensors.yaml
deleted file mode 100644
index 538b4c8..0000000
--- a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/ac922-ipmi-extra-hwmon-sensors.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-222:
-    bExp: 0
-    entityID: 29
-    entityInstance: 2
-    interfaces:
-        xyz.openbmc_project.Sensor.Value:
-            Value:
-                Offsets:
-                    255:
-                        type: int64_t
-    multiplierM: 100
-    offsetB: 0
-    path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
-    rExp: 0
-    readingType: readingData
-    scale: 0
-    sensorNamePattern: nameLeaf
-    sensorReadingType: 1
-    sensorType: 4
-    serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-226:
-    bExp: 0
-    entityID: 29
-    entityInstance: 4
-    interfaces:
-        xyz.openbmc_project.Sensor.Value:
-            Value:
-                Offsets:
-                    255:
-                        type: int64_t
-    multiplierM: 100
-    offsetB: 0
-    path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
-    rExp: 0
-    readingType: readingData
-    scale: 0
-    sensorNamePattern: nameLeaf
-    sensorReadingType: 1
-    sensorType: 4
-    serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-228:
-    bExp: 0
-    entityID: 29
-    entityInstance: 6
-    interfaces:
-        xyz.openbmc_project.Sensor.Value:
-            Value:
-                Offsets:
-                    255:
-                        type: int64_t
-    multiplierM: 100
-    offsetB: 0
-    path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
-    rExp: 0
-    readingType: readingData
-    scale: 0
-    sensorNamePattern: nameLeaf
-    sensorReadingType: 1
-    sensorType: 4
-    serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
-230:
-    bExp: 0
-    entityID: 29
-    entityInstance: 8
-    interfaces:
-        xyz.openbmc_project.Sensor.Value:
-            Value:
-                Offsets:
-                    255:
-                        type: int64_t
-    multiplierM: 100
-    offsetB: 0
-    path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
-    rExp: 0
-    readingType: readingData
-    scale: 0
-    sensorNamePattern: nameLeaf
-    sensorReadingType: 1
-    sensorType: 4
-    serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
diff --git a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml
similarity index 84%
copy from meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml
copy to meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml
index 6d22a61..803ed77 100644
--- a/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-hwmon-sensors.yaml
+++ b/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml
@@ -460,3 +460,87 @@
     sensorType: 1
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+222:
+    bExp: 0
+    entityID: 29
+    entityInstance: 2
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 100
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
+    rExp: 0
+    readingType: readingData
+    scale: 0
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 4
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+226:
+    bExp: 0
+    entityID: 29
+    entityInstance: 4
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 100
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
+    rExp: 0
+    readingType: readingData
+    scale: 0
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 4
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+228:
+    bExp: 0
+    entityID: 29
+    entityInstance: 6
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 100
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
+    rExp: 0
+    readingType: readingData
+    scale: 0
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 4
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+230:
+    bExp: 0
+    entityID: 29
+    entityInstance: 8
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 100
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
+    rExp: 0
+    readingType: readingData
+    scale: 0
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 4
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS