diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
index b920050..9aa7462 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml
@@ -1,7 +1,7 @@
 BMC:
     xyz.openbmc_project.Inventory.Decorator.Asset:
-        VINI,PN: PartNumber
-        VINI,SN: SerialNumber
+        OPFR,VP: PartNumber
+        OPFR,VS: SerialNumber
         OPFR,VN: Manufacturer
     xyz.openbmc_project.Inventory.Item:
         VINI,DR: PrettyName