diff --git a/configurations/meta/harma_mb.json b/configurations/meta/harma_mb.json
index 63f007b..7b92bb0 100644
--- a/configurations/meta/harma_mb.json
+++ b/configurations/meta/harma_mb.json
@@ -1687,10 +1687,10 @@
             "Model": "$PRODUCT_PRODUCT_NAME",
             "PartNumber": "$PRODUCT_PART_NUMBER",
             "SerialNumber": "$PRODUCT_INFO_AM2",
-            "SparePartNumber": "$PRODUCT_FRU_VERSION_ID"
+            "SparePartNumber": "$CHASSIS_INFO_AM1"
         },
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
-            "AssetTag": "$PRODUCT_INFO_AM3"
+            "AssetTag": "$CHASSIS_INFO_AM3"
         }
     },
     {
diff --git a/configurations/meta/harma_mb_vr_infineon.json b/configurations/meta/harma_mb_vr_infineon.json
index 4714d5f..edf56ad 100644
--- a/configurations/meta/harma_mb_vr_infineon.json
+++ b/configurations/meta/harma_mb_vr_infineon.json
@@ -1685,10 +1685,10 @@
             "Model": "$PRODUCT_PRODUCT_NAME",
             "PartNumber": "$PRODUCT_PART_NUMBER",
             "SerialNumber": "$PRODUCT_INFO_AM2",
-            "SparePartNumber": "$PRODUCT_FRU_VERSION_ID"
+            "SparePartNumber": "$CHASSIS_INFO_AM1"
         },
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
-            "AssetTag": "$PRODUCT_INFO_AM3"
+            "AssetTag": "$CHASSIS_INFO_AM3"
         }
     },
     {