diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
index a2031c9..446cd93 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
@@ -671,6 +671,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c01_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1"
+                    ]
                 }
             ]
         },
@@ -699,6 +710,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c02_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2"
+                    ]
                 }
             ]
         },
@@ -727,6 +749,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c03_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3"
+                    ]
                 }
             ]
         },
@@ -755,6 +788,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c04_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4"
+                    ]
                 }
             ]
         },
@@ -783,6 +827,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c05_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5/pcie_card5"
+                    ]
                 }
             ]
         },
@@ -811,6 +866,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c06_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6"
+                    ]
                 }
             ]
         },
@@ -839,6 +905,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c07_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7"
+                    ]
                 }
             ]
         },
@@ -867,6 +944,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c08_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8"
+                    ]
                 }
             ]
         },
@@ -895,6 +983,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c09_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9"
+                    ]
                 }
             ]
         },
@@ -923,6 +1022,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c10_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10"
+                    ]
                 }
             ]
         },
@@ -951,6 +1061,34 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot_c11_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+                    ]
+                }
+            ]
+        },
+        {
+            "path": "system/chassis/motherboard/pcieslot12",
+            "endpoints":
+            [
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot12/pcie_card12"
+                    ]
                 }
             ]
         },
@@ -2587,6 +2725,17 @@
                     [
                         "/xyz/openbmc_project/inventory/system/chassis/motherboard/dcm3/cpu1"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme0/drive0"
+                    ]
                 }
             ]
         },
@@ -2619,6 +2768,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme1/drive1"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2658,6 +2818,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme2/drive2"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2697,6 +2868,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme3/drive3"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2736,6 +2918,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme4/drive4"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2775,6 +2968,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme5/drive5"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2814,6 +3018,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme6/drive6"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2853,6 +3068,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme7/drive7"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2892,6 +3118,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme8/drive8"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2931,6 +3168,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme9/drive9"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
index b676408..931f6d5 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
@@ -2012,6 +2012,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2051,6 +2062,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2090,6 +2112,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2129,6 +2162,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2168,6 +2212,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2203,6 +2258,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot6_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6"
+                    ]
                 }
             ]
         },
@@ -2235,6 +2301,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2274,6 +2351,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2313,6 +2401,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2352,6 +2451,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2391,6 +2501,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2402,6 +2523,23 @@
             ]
         },
         {
+            "path": "system/chassis/motherboard/pcieslot12",
+            "endpoints":
+            [
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot12/pcie_card12"
+                    ]
+                }
+            ]
+        },
+        {
             "path": "system/chassis/motherboard/pcieslot0/pcie_card0",
             "endpoints":
             [
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
index 0b69a15..2281d86 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
@@ -2157,6 +2157,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0/pcie_card0"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2196,6 +2207,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1/pcie_card1"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2235,6 +2257,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2/pcie_card2"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2274,6 +2307,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3/pcie_card3"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2313,6 +2357,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2348,6 +2403,17 @@
                     [
                         "/xyz/openbmc_project/led/groups/pcieslot6_identify"
                     ]
+                },
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6/pcie_card6"
+                    ]
                 }
             ]
         },
@@ -2380,6 +2446,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7/pcie_card7"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2419,6 +2496,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2458,6 +2546,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9/pcie_card9"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2497,6 +2596,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2536,6 +2646,17 @@
                 {
                     "types":
                     {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "connecting",
                         "fType": "connected_to"
                     },
@@ -2547,6 +2668,23 @@
             ]
         },
         {
+            "path": "system/chassis/motherboard/pcieslot12",
+            "endpoints":
+            [
+                {
+                    "types":
+                    {
+                        "rType": "contained_by",
+                        "fType": "containing"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot12/pcie_card12"
+                    ]
+                }
+            ]
+        },
+        {
             "path": "system/chassis/motherboard/pcieslot0/pcie_card0",
             "endpoints":
             [