diff --git a/configurations/bnp_baseboard.json b/configurations/bnp_baseboard.json
index b9b2900..744dc04 100644
--- a/configurations/bnp_baseboard.json
+++ b/configurations/bnp_baseboard.json
@@ -82,7 +82,6 @@
     ],
     "Name": "BNP Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*BNP'})",
-    "ProductId": 124,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/genesis3_baseboard.json b/configurations/genesis3_baseboard.json
index 16f4e0c..38ef8b2 100644
--- a/configurations/genesis3_baseboard.json
+++ b/configurations/genesis3_baseboard.json
@@ -2135,7 +2135,6 @@
     ],
     "Name": "IBM Genesis3 Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*Genesis3'})",
-    "ProductId": 0,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/genesis3_psu.json b/configurations/genesis3_psu.json
index 4b8d5fa..b5fc3d6 100644
--- a/configurations/genesis3_psu.json
+++ b/configurations/genesis3_psu.json
@@ -52,7 +52,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 1",
         "Probe": "FOUND('IBM Genesis3 Baseboard')",
-        "ProductId": 1,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -118,7 +117,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 2",
         "Probe": "FOUND('IBM Genesis3 Baseboard')",
-        "ProductId": 2,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -184,7 +182,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 3",
         "Probe": "FOUND('IBM Genesis3 Baseboard')",
-        "ProductId": 3,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -250,7 +247,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 4",
         "Probe": "FOUND('IBM Genesis3 Baseboard')",
-        "ProductId": 4,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
diff --git a/configurations/meta/harma_mb.json b/configurations/meta/harma_mb.json
index 931d9f8..c5e700e 100644
--- a/configurations/meta/harma_mb.json
+++ b/configurations/meta/harma_mb.json
@@ -1223,9 +1223,7 @@
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
             "AssetTag": "$PRODUCT_ASSET_TAG"
         },
-        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-            "ProductId": 1
-        }
+        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
     },
     {
         "Exposes": [
diff --git a/configurations/meta/harma_mb_vr_infineon.json b/configurations/meta/harma_mb_vr_infineon.json
index 7ca9e5d..f6137c8 100644
--- a/configurations/meta/harma_mb_vr_infineon.json
+++ b/configurations/meta/harma_mb_vr_infineon.json
@@ -1221,9 +1221,7 @@
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
             "AssetTag": "$PRODUCT_ASSET_TAG"
         },
-        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-            "ProductId": 1
-        }
+        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
     },
     {
         "Exposes": [
diff --git a/configurations/meta/minerva_cmm.json b/configurations/meta/minerva_cmm.json
index 21cadb8..822774f 100644
--- a/configurations/meta/minerva_cmm.json
+++ b/configurations/meta/minerva_cmm.json
@@ -260,9 +260,7 @@
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
             "AssetTag": "$PRODUCT_ASSET_TAG"
         },
-        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-            "ProductId": 1
-        },
+        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {},
         "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
             "MACAddress": "$CHASSIS_INFO_AM2"
         }
diff --git a/configurations/meta/minerva_cmm_hsc_infineon.json b/configurations/meta/minerva_cmm_hsc_infineon.json
index 580ac63..e3e7480 100644
--- a/configurations/meta/minerva_cmm_hsc_infineon.json
+++ b/configurations/meta/minerva_cmm_hsc_infineon.json
@@ -286,9 +286,7 @@
         "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
             "AssetTag": "$PRODUCT_ASSET_TAG"
         },
-        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-            "ProductId": 1
-        },
+        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {},
         "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
             "MACAddress": "$CHASSIS_INFO_AM2"
         }
diff --git a/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
index a8f6f2e..2d24e83 100644
--- a/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
+++ b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
@@ -287,9 +287,7 @@
     "xyz.openbmc_project.Inventory.Decorator.Revision": {
         "Version": "$PRODUCT_VERSION"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    },
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {},
     "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
         "MACAddress": "$CHASSIS_INFO_AM2"
     }
diff --git a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
index 024c68e..4eda3f4 100644
--- a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
+++ b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
@@ -283,9 +283,7 @@
     "xyz.openbmc_project.Inventory.Decorator.Revision": {
         "Version": "$PRODUCT_VERSION"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    },
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {},
     "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
         "MACAddress": "$CHASSIS_INFO_AM2"
     }
diff --git a/configurations/meta/yosemite4_sentineldome_t1.json b/configurations/meta/yosemite4_sentineldome_t1.json
index 949a539..67364e2 100644
--- a/configurations/meta/yosemite4_sentineldome_t1.json
+++ b/configurations/meta/yosemite4_sentineldome_t1.json
@@ -383,7 +383,5 @@
     "xyz.openbmc_project.Inventory.Decorator.Slot": {
         "SlotNumber": "$bus % 15"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    }
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
 }
diff --git a/configurations/meta/yosemite4_sentineldome_t1_retimer.json b/configurations/meta/yosemite4_sentineldome_t1_retimer.json
index aaef830..a542ad2 100644
--- a/configurations/meta/yosemite4_sentineldome_t1_retimer.json
+++ b/configurations/meta/yosemite4_sentineldome_t1_retimer.json
@@ -443,7 +443,5 @@
     "xyz.openbmc_project.Inventory.Decorator.Slot": {
         "SlotNumber": "$bus % 15"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    }
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
 }
diff --git a/configurations/meta/yosemite4_sentineldome_t2.json b/configurations/meta/yosemite4_sentineldome_t2.json
index c88c453..6790468 100644
--- a/configurations/meta/yosemite4_sentineldome_t2.json
+++ b/configurations/meta/yosemite4_sentineldome_t2.json
@@ -454,7 +454,5 @@
     "xyz.openbmc_project.Inventory.Decorator.Slot": {
         "SlotNumber": "$bus % 15"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    }
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
 }
diff --git a/configurations/meta/yosemite4_sentineldome_t2_retimer.json b/configurations/meta/yosemite4_sentineldome_t2_retimer.json
index ee41d00..2593ade 100644
--- a/configurations/meta/yosemite4_sentineldome_t2_retimer.json
+++ b/configurations/meta/yosemite4_sentineldome_t2_retimer.json
@@ -514,7 +514,5 @@
     "xyz.openbmc_project.Inventory.Decorator.Slot": {
         "SlotNumber": "$bus % 15"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 1
-    }
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}
 }
diff --git a/configurations/sbp1_baseboard.json b/configurations/sbp1_baseboard.json
index 692471f..4602e13 100644
--- a/configurations/sbp1_baseboard.json
+++ b/configurations/sbp1_baseboard.json
@@ -6289,7 +6289,6 @@
     ],
     "Name": "IBM SBP1 Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*SBP1'})",
-    "ProductId": 0,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/sbp1_hbm.json b/configurations/sbp1_hbm.json
index 9f1bb2d..1c6e22c 100644
--- a/configurations/sbp1_hbm.json
+++ b/configurations/sbp1_hbm.json
@@ -472,6 +472,5 @@
         "xyz.openbmc_project.Inventory.Decorator.Revision({'Version': '.*HBM.*'})",
         "MATCH_ONE"
     ],
-    "ProductId": 1,
     "Type": "Board"
 }
diff --git a/configurations/sbp1_nvme.json b/configurations/sbp1_nvme.json
index d0f4caa..af49016 100644
--- a/configurations/sbp1_nvme.json
+++ b/configurations/sbp1_nvme.json
@@ -45,7 +45,6 @@
     ],
     "Name": "SBP1 NVMe",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*SBP1'})",
-    "ProductId": 0,
     "Type": "NVMe",
     "xyz.openbmc_project.Inventory.Item.Chassis": {}
 }
diff --git a/configurations/sbp1_psu.json b/configurations/sbp1_psu.json
index faa8f39..b2044da 100644
--- a/configurations/sbp1_psu.json
+++ b/configurations/sbp1_psu.json
@@ -136,7 +136,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 1",
         "Probe": "FOUND('IBM SBP1 Baseboard')",
-        "ProductId": 1,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -286,7 +285,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 2",
         "Probe": "FOUND('IBM SBP1 Baseboard')",
-        "ProductId": 2,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -436,7 +434,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 3",
         "Probe": "FOUND('IBM SBP1 Baseboard')",
-        "ProductId": 3,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
@@ -586,7 +583,6 @@
         ],
         "Name": "Vicor BCM 6123 750W 4",
         "Probe": "FOUND('IBM SBP1 Baseboard')",
-        "ProductId": 4,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Vicor",
diff --git a/configurations/stp_baseboard.json b/configurations/stp_baseboard.json
index 40c88a9..24d2f6d 100644
--- a/configurations/stp_baseboard.json
+++ b/configurations/stp_baseboard.json
@@ -843,7 +843,6 @@
     ],
     "Name": "STP Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
-    "ProductId": 125,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/system1_baseboard.json b/configurations/system1_baseboard.json
index c174d29..3f02e38 100644
--- a/configurations/system1_baseboard.json
+++ b/configurations/system1_baseboard.json
@@ -777,7 +777,6 @@
     ],
     "Name": "IBM System1 Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*SYS1', 'BOARD_MANUFACTURER': 'IBM'})",
-    "ProductId": 0,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/system1_psu.json b/configurations/system1_psu.json
index 2a0feb6..aaa728f 100644
--- a/configurations/system1_psu.json
+++ b/configurations/system1_psu.json
@@ -20,7 +20,6 @@
         ],
         "Name": "Intel CRPS185 2400W 1",
         "Probe": "FOUND('IBM System1 Baseboard')",
-        "ProductId": 1,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Intel",
@@ -54,7 +53,6 @@
         ],
         "Name": "Intel CRPS185 2400W 2",
         "Probe": "FOUND('IBM System1 Baseboard')",
-        "ProductId": 2,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Intel",
@@ -88,7 +86,6 @@
         ],
         "Name": "Intel CRPS185 2400W 3",
         "Probe": "FOUND('IBM System1 Baseboard')",
-        "ProductId": 3,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Intel",
@@ -122,7 +119,6 @@
         ],
         "Name": "Intel CRPS185 2400W 4",
         "Probe": "FOUND('IBM System1 Baseboard')",
-        "ProductId": 4,
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "Intel",
diff --git a/configurations/wft_baseboard.json b/configurations/wft_baseboard.json
index 992673a..845ccdf 100644
--- a/configurations/wft_baseboard.json
+++ b/configurations/wft_baseboard.json
@@ -1632,8 +1632,6 @@
     "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
         "AssetTag": "$PRODUCT_ASSET_TAG"
     },
-    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-        "ProductId": 123
-    },
+    "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {},
     "xyz.openbmc_project.Inventory.Item.System": {}
 }
diff --git a/schemas/global.json b/schemas/global.json
index 2136a0e..75aeb41 100644
--- a/schemas/global.json
+++ b/schemas/global.json
@@ -115,9 +115,6 @@
                 "xyz.openbmc_project.Inventory.Decorator.Asset": {
                     "$ref": "openbmc-dbus.json#/$defs/xyz/openbmc_project/Inventory/Decorator/Asset"
                 },
-                "ProductId": {
-                    "type": "number"
-                },
                 "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
                     "$ref": "openbmc-dbus.json#/$defs/xyz/openbmc_project/Inventory/Decorator/AssetTag"
                 },
diff --git a/schemas/openbmc-dbus.json b/schemas/openbmc-dbus.json
index d455102..ed75330 100644
--- a/schemas/openbmc-dbus.json
+++ b/schemas/openbmc-dbus.json
@@ -120,12 +120,6 @@
                         "Board": {
                             "Motherboard": {
                                 "additionalProperties": false,
-                                "properties": {
-                                    "ProductId": {
-                                        "type": "number"
-                                    }
-                                },
-                                "required": ["ProductId"],
                                 "type": "object"
                             }
                         },