diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
index 8640e62..207eb50 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
@@ -1,6 +1,6 @@
 DEVPATH=/sys/bus/i2c/devices/3-0069
 INSTANCE=0
-INVENTORY=/system/chassis/powersupply0
+INVENTORY=/system/chassis/motherboard/powersupply0
 NUM_HISTORY_RECORDS=120
 SYNC_GPIO_PATH=/dev/gpiochip0
 SYNC_GPIO_NUM=105
\ No newline at end of file
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
index b481ef2..73efd45 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
@@ -1,6 +1,6 @@
 DEVPATH=/sys/bus/i2c/devices/3-0068
 INSTANCE=1
-INVENTORY=/system/chassis/powersupply1
+INVENTORY=/system/chassis/motherboard/powersupply1
 NUM_HISTORY_RECORDS=120
 SYNC_GPIO_PATH=/dev/gpiochip0
 SYNC_GPIO_NUM=105
\ No newline at end of file
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
index a4f17e9..ba4e368 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Witherspoon Power Supply %I Monitor
-Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
-After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
+Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
+After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
 Wants=mapper-wait@-org-openbmc-control-power0.service
 After=mapper-wait@-org-openbmc-control-power0.service
 ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf