diff --git a/configurations/meta/minerva_cmm.json b/configurations/meta/minerva_cmm.json
index b6e47da..828c738 100644
--- a/configurations/meta/minerva_cmm.json
+++ b/configurations/meta/minerva_cmm.json
@@ -270,12 +270,12 @@
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
             "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_INFO_AM2",
-            "SparePartNumber": "$PRODUCT_FRU_VERSION_ID"
+            "PartNumber": "$CHASSIS_PART_NUMBER",
+            "SerialNumber": "$CHASSIS_SERIAL_NUMBER",
+            "SparePartNumber": "$CHASSIS_INFO_AM1"
         },
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
-            "AssetTag": "$PRODUCT_INFO_AM3"
+            "AssetTag": "$CHASSIS_INFO_AM3"
         }
     }
 ]
diff --git a/configurations/meta/minerva_cmm_hsc_infineon.json b/configurations/meta/minerva_cmm_hsc_infineon.json
index 0f022db..2c398e9 100644
--- a/configurations/meta/minerva_cmm_hsc_infineon.json
+++ b/configurations/meta/minerva_cmm_hsc_infineon.json
@@ -294,12 +294,12 @@
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
             "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_INFO_AM2",
-            "SparePartNumber": "$PRODUCT_FRU_VERSION_ID"
+            "PartNumber": "$CHASSIS_PART_NUMBER",
+            "SerialNumber": "$CHASSIS_SERIAL_NUMBER",
+            "SparePartNumber": "$CHASSIS_INFO_AM1"
         },
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
-            "AssetTag": "$PRODUCT_INFO_AM3"
+            "AssetTag": "$CHASSIS_INFO_AM3"
         }
     }
 ]