diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index e1cc34d..452fd8c 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1589,7 +1589,6 @@
     ],
     "Name": "WFP Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
-    "ProductId": 123,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
@@ -1597,5 +1596,11 @@
         "PartNumber": "$BOARD_PART_NUMBER",
         "SerialNumber": "$BOARD_SERIAL_NUMBER"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
+    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+        "AssetTag": "$PRODUCT_ASSET_TAG"
+    },
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
+        "ProductId": 123
+    },
+    "xyz.openbmc_project.Inventory.Item.System": {}
 }
\ No newline at end of file