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 7178184..7dada72 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
@@ -25,6 +25,8 @@
         # Delimiter value in ascii as YAML parser
         # was not allowing certain characters like ":" as value
         IPMIFruValueDelimiter: "58"
+    xyz.openbmc_project.Inventory.Item.Cpu:
+
 SYS:
   Interfaces:
     xyz.openbmc_project.Inventory.Decorator.Asset:
@@ -34,6 +36,7 @@
       SerialNumber:
         IPMIFruSection: Chassis
         IPMIFruProperty: "Serial Number"
+    xyz.openbmc_project.Inventory.Item.System:
 
 NODE:
   Interfaces:
@@ -54,6 +57,7 @@
       PrettyName:
         IPMIFruSection: Board
         IPMIFruProperty: "Name"
+    xyz.openbmc_project.Inventory.Item.Chassis:
   AssociatedTypes:
     - SYS
 
@@ -83,6 +87,7 @@
       Version:
         IPMIFruSection: Product
         IPMIFruProperty: "Version"
+    xyz.openbmc_project.Inventory.Item.Dimm:
 
 MEMBUFF:
   Interfaces:
@@ -103,3 +108,4 @@
       PrettyName:
         IPMIFruSection: Board
         IPMIFruProperty: "Name"
+    xyz.openbmc_project.Inventory.Item.MemoryBuffer:
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
index eb7f827..b920050 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
@@ -7,9 +7,9 @@
         VINI,DR: PrettyName
     xyz.openbmc_project.Common.UUID:
         OPFR,UD: UUID
-
-
+    xyz.openbmc_project.Inventory.Item.Bmc:
 ETHERNET:
     xyz.openbmc_project.Inventory.Item.NetworkInterface:
         VINI,B1: MACAddress
         OPFR,B1: MACAddress
+    xyz.openbmc_project.Inventory.Item.Ethernet: