diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
index 2c7f8ee..7178184 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/hostboot-inventory-config/config.yaml
@@ -28,15 +28,12 @@
 SYS:
   Interfaces:
     xyz.openbmc_project.Inventory.Decorator.Asset:
-      PartNumber:
+      Model:
         IPMIFruSection: Chassis
         IPMIFruProperty: "Part Number"
       SerialNumber:
         IPMIFruSection: Chassis
         IPMIFruProperty: "Serial Number"
-      Model:
-        IPMIFruSection: Chassis
-        IPMIFruProperty: "Type"
 
 NODE:
   Interfaces:
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml
index ea2ca44..68d2096 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/ipmi/firestone-ipmi-inventory-map/config.yaml
@@ -71,11 +71,8 @@
       SerialNumber:
         IPMIFruProperty: Serial Number
         IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
       Model:
-        IPMIFruProperty: Type
+        IPMIFruProperty: Part Number
         IPMIFruSection: Chassis
 4:
   /system/chassis/motherboard/membuf0:
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml
index ea2ca44..68d2096 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map/config.yaml
@@ -71,11 +71,8 @@
       SerialNumber:
         IPMIFruProperty: Serial Number
         IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
       Model:
-        IPMIFruProperty: Type
+        IPMIFruProperty: Part Number
         IPMIFruSection: Chassis
 4:
   /system/chassis/motherboard/membuf0:
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml
index c2b0f5c..d141bab 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/palmetto-ipmi-inventory-map/config.yaml
@@ -28,11 +28,8 @@
       SerialNumber:
         IPMIFruProperty: Serial Number
         IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
       Model:
-        IPMIFruProperty: Type
+        IPMIFruProperty: Part Number
         IPMIFruSection: Chassis
 
   /system/chassis/motherboard/membuf:
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml
index 3af5e6f..c459072 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml
@@ -71,11 +71,8 @@
       SerialNumber:
         IPMIFruProperty: Serial Number
         IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
       Model:
-        IPMIFruProperty: Type
+        IPMIFruProperty: Part Number
         IPMIFruSection: Chassis
 12:
   /system/chassis/motherboard/dimm0:
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
index cc8abc1..d337577 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/ipmi/barreleye-ipmi-inventory-map/config.yaml
@@ -71,11 +71,8 @@
       SerialNumber:
         IPMIFruProperty: Serial Number
         IPMIFruSection: Chassis
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Chassis
       Model:
-        IPMIFruProperty: Type
+        IPMIFruProperty: Part Number
         IPMIFruSection: Chassis
 4:
   /system/chassis/motherboard/membuf0: