diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
index e6dfdac..e26c8f5 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-0.conf
@@ -1,6 +1,6 @@
 #The gpio 70 is a real gpio, which is used to
 #store the sas cable 0 present signal
-INVENTORY=/system/chassis/gpios/ss_cab0_prsnt
+INVENTORY=/system/chassis/cable/ss_cab0_prsnt
 DEVPATH=/dev/input/event0
 KEY=70
 NAME=ss_cab0_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
index 2f3e5f5..e6a18ee 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-1.conf
@@ -1,6 +1,6 @@
 #The gpio 71 is a real gpio, which is used to
 #store the sas cable 1 present signal
-INVENTORY=/system/chassis/gpios/ss_cab1_prsnt
+INVENTORY=/system/chassis/cable/ss_cab1_prsnt
 DEVPATH=/dev/input/event0
 KEY=71
 NAME=ss_cab1_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
index 719311d..490f97f 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-2.conf
@@ -1,6 +1,6 @@
 #The gpio 72 is a real gpio, which is used to
 #store the sas cable 2 present signal
-INVENTORY=/system/chassis/gpios/ss_cab2_prsnt
+INVENTORY=/system/chassis/cable/ss_cab2_prsnt
 DEVPATH=/dev/input/event0
 KEY=72
 NAME=ss_cab2_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
index 2e1a828..f3579ab 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-3.conf
@@ -1,6 +1,6 @@
 #The gpio 73 is a real gpio, which is used to
 #store the sas cable 3 present signal
-INVENTORY=/system/chassis/gpios/ss_cab3_prsnt
+INVENTORY=/system/chassis/cable/ss_cab3_prsnt
 DEVPATH=/dev/input/event0
 KEY=73
 NAME=ss_cab3_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
index ecd0747..be6ed95 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-4.conf
@@ -1,6 +1,6 @@
 #The gpio 57 is a real gpio, which is used to
 #store the HSBP cable present signal
-INVENTORY=/system/chassis/gpios/hsbp_cab_prsnt
+INVENTORY=/system/chassis/cable/hsbp_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=57
 NAME=hsbp_cab_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
index 2838872..223ef4a 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-5.conf
@@ -1,6 +1,6 @@
 #The gpio 58 is a real gpio, which is used to
 #store the fan board cable present signal
-INVENTORY=/system/chassis/gpios/fanbd_cab_prsnt
+INVENTORY=/system/chassis/cable/fanbd_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=58
 NAME=fanbd_cab_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
index ca3fbd4..c32fb3c 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-6.conf
@@ -1,6 +1,6 @@
 #The gpio 69 is a real gpio, which is used to
 #store the HSBP 12V standby cable present signal
-INVENTORY=/system/chassis/gpios/bp12v_cab_prsnt
+INVENTORY=/system/chassis/cable/bp12v_cab_prsnt
 DEVPATH=/dev/input/event0
 KEY=69
 NAME=bp12v_cab_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
index 0a0aed7..1cc7da2 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-7.conf
@@ -1,6 +1,6 @@
 #The gpio 5 is a real gpio, which is used to
 #store the SATA0 present signal
-INVENTORY=/system/chassis/gpios/sata0_prsnt
+INVENTORY=/system/chassis/entity/sata0_prsnt
 DEVPATH=/dev/input/event0
 KEY=5
 NAME=sata0_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
index 342aaf0..38c72e1 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-8.conf
@@ -1,6 +1,6 @@
 #The gpio 120 is a real gpio, which is used to
 #store the PE0 present signal
-INVENTORY=/system/chassis/gpios/pe_slot0_prsnt
+INVENTORY=/system/chassis/entity/pe_slot0_prsnt
 DEVPATH=/dev/input/event0
 KEY=120
 NAME=pe_slot0_prsnt
diff --git a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
index 10d3a2e..007229d 100644
--- a/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
+++ b/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-9.conf
@@ -1,6 +1,6 @@
 #The gpio 121 is a real gpio, which is used to
 #store the PE1 present signal
-INVENTORY=/system/chassis/gpios/pe_slot1_prsnt
+INVENTORY=/system/chassis/entity/pe_slot1_prsnt
 DEVPATH=/dev/input/event0
 KEY=121
 NAME=pe_slot1_prsnt