diff --git a/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml b/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
index c444504..a4eab8a 100644
--- a/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
+++ b/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
@@ -17,124 +17,124 @@
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Cpu:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/cpu1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Cpu:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm0:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm10:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm11:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm12:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm13:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm14:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm15:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm2:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm3:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm4:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm5:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm6:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm7:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm8:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
 /system/chassis/motherboard/dimm9:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item.Dimm:
+    xyz.openbmc_project.Inventory.Item:
         Present: 'true'
diff --git a/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml b/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml
index 19859fb..7fc2d15 100644
--- a/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml
+++ b/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru.yaml
@@ -25,6 +25,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Board
+            xyz.openbmc_project.Inventory.Item.Cpu:
 2:
     /system/chassis/motherboard/cpu1:
         entityID: 3
@@ -53,18 +54,36 @@
                     IPMIFruProperty: Name
                     IPMIFruSection: Board
                     Value: false
+            xyz.openbmc_project.Inventory.Item.Cpu:
 3:
     /system:
         entityID: 6
         entityInstance: 1
         interfaces:
             xyz.openbmc_project.Inventory.Decorator.Asset:
+                BuildDate:
+                    IPMIFruProperty: Mfg Date
+                    IPMIFruSection: Product
+                Manufacturer:
+                    IPMIFruProperty: Manufacturer
+                    IPMIFruSection: Product
                 Model:
+                    IPMIFruProperty: Model Number
+                    IPMIFruSection: Product
+                PartNumber:
                     IPMIFruProperty: Part Number
-                    IPMIFruSection: Chassis
+                    IPMIFruSection: Product
                 SerialNumber:
                     IPMIFruProperty: Serial Number
-                    IPMIFruSection: Chassis
+                    IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Decorator.Revision:
+                Version:
+                    IPMIFruProperty: Version
+            xyz.openbmc_project.Inventory.Item:
+                PrettyName:
+                    IPMIFruProperty: Name
+                    IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.System:
     /system/chassis/motherboard/bmc:
         entityID: 7
         entityInstance: 1
@@ -114,6 +133,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 5:
     /system/chassis/motherboard/dimm1:
         entityID: 32
@@ -142,6 +162,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 6:
     /system/chassis/motherboard/dimm2:
         entityID: 32
@@ -170,6 +191,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 7:
     /system/chassis/motherboard/dimm3:
         entityID: 32
@@ -198,6 +220,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 8:
     /system/chassis/motherboard/dimm4:
         entityID: 32
@@ -226,6 +249,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 9:
     /system/chassis/motherboard/dimm5:
         entityID: 32
@@ -254,6 +278,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 10:
     /system/chassis/motherboard/dimm6:
         entityID: 32
@@ -282,6 +307,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 11:
     /system/chassis/motherboard/dimm7:
         entityID: 32
@@ -310,6 +336,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 12:
     /system/chassis/motherboard/dimm8:
         entityID: 32
@@ -338,6 +365,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 13:
     /system/chassis/motherboard/dimm9:
         entityID: 32
@@ -366,6 +394,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 14:
     /system/chassis/motherboard/dimm10:
         entityID: 32
@@ -394,6 +423,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 15:
     /system/chassis/motherboard/dimm11:
         entityID: 32
@@ -422,6 +452,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 16:
     /system/chassis/motherboard/dimm12:
         entityID: 32
@@ -450,6 +481,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 17:
     /system/chassis/motherboard/dimm13:
         entityID: 32
@@ -478,6 +510,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 18:
     /system/chassis/motherboard/dimm14:
         entityID: 32
@@ -506,6 +539,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 19:
     /system/chassis/motherboard/dimm15:
         entityID: 32
@@ -534,6 +568,7 @@
                 PrettyName:
                     IPMIFruProperty: Name
                     IPMIFruSection: Product
+            xyz.openbmc_project.Inventory.Item.Dimm:
 20:
     /system/chassis/motherboard/bmc/ethernet:
         entityID: 7