diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
index 73de9bc..f2ba6a3 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
@@ -1,5 +1,5 @@
 INVENTORY=/system/chassis/powersupply0
 DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=127
+KEY=104
 NAME=powersupply0
-DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
+DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
index facbd08..98c4db3 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
@@ -1,5 +1,5 @@
 INVENTORY=/system/chassis/powersupply1
 DEVPATH=/dev/input/by-path/platform-gpio-keys-event
-KEY=104
+KEY=127
 NAME=powersupply1
-DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
+DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
index 1a8c7c9..d1b3af6 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
@@ -1,4 +1,4 @@
-DEVPATH=/sys/bus/i2c/devices/3-0068
+DEVPATH=/sys/bus/i2c/devices/3-0069
 INSTANCE=0
 INVENTORY=/system/chassis/powersupply0
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
index fe29da3..11c8a64 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
@@ -1,4 +1,4 @@
-DEVPATH=/sys/bus/i2c/devices/3-0069
+DEVPATH=/sys/bus/i2c/devices/3-0068
 INSTANCE=1
 INVENTORY=/system/chassis/powersupply1
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
index bf7e145..e463b51 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
@@ -1,23 +1,23 @@
-LABEL_in1="ps0_input_voltage"
+LABEL_in1="ps1_input_voltage"
 WARNHI_in1="290000"
 WARNLO_in1="200000"
 CRITHI_in1="300000"
 CRITLO_in1="180000"
 
-LABEL_in2="ps0_output_voltage"
+LABEL_in2="ps1_output_voltage"
 WARNHI_in2="12700"
 WARNLO_in2="0"
 CRITHI_in2="13000"
 CRITLO_in2="0"
 
-LABEL_curr1="ps0_output_current"
+LABEL_curr1="ps1_output_current"
 WARNHI_curr1="170000"
 WARNLO_curr1="0"
 CRITHI_curr1="180000"
 CRITLO_curr1="0"
 
-LABEL_power1="ps0_input_power"
+LABEL_power1="ps1_input_power"
 WARNHI_power1="2350000000"
 WARNLO_power1="0"
 CRITHI_power1="2500000000"
-CRITLO_power1="0"
\ No newline at end of file
+CRITLO_power1="0"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
index c5e450e..2fadbde 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
@@ -1,23 +1,23 @@
-LABEL_in1="ps1_input_voltage"
+LABEL_in1="ps0_input_voltage"
 WARNHI_in1="290000"
 WARNLO_in1="200000"
 CRITHI_in1="300000"
 CRITLO_in1="180000"
 
-LABEL_in2="ps1_output_voltage"
+LABEL_in2="ps0_output_voltage"
 WARNHI_in2="12700"
 WARNLO_in2="0"
 CRITHI_in2="13000"
 CRITLO_in2="0"
 
-LABEL_curr1="ps1_output_current"
+LABEL_curr1="ps0_output_current"
 WARNHI_curr1="170000"
 WARNLO_curr1="0"
 CRITHI_curr1="180000"
 CRITLO_curr1="0"
 
-LABEL_power1="ps1_input_power"
+LABEL_power1="ps0_input_power"
 WARNHI_power1="2350000000"
 WARNLO_power1="0"
 CRITHI_power1="2500000000"
-CRITLO_power1="0"
\ No newline at end of file
+CRITLO_power1="0"