diff --git a/configurations/mtmitchell_bmc.json b/configurations/mtmitchell_bmc.json
index d3e6498..cbc0b82 100644
--- a/configurations/mtmitchell_bmc.json
+++ b/configurations/mtmitchell_bmc.json
@@ -118,9 +118,17 @@
     "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': '.*Mitchell BMC*'})",
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
+        "BuildDate": "$BOARD_MANUFACTURE_DATE",
         "Manufacturer": "$BOARD_MANUFACTURER",
         "Model": "$BOARD_PRODUCT_NAME",
         "PartNumber": "$BOARD_PART_NUMBER",
         "SerialNumber": "$BOARD_SERIAL_NUMBER"
+    },
+    "xyz.openbmc_project.Inventory.Decorator.Replaceable": {
+        "FieldReplaceable": false,
+        "HotPluggable": false
+    },
+    "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
+        "MACAddress": "$BOARD_INFO_AM1"
     }
 }
diff --git a/configurations/mtmitchell_mb.json b/configurations/mtmitchell_mb.json
index d1f0572..53e0642 100644
--- a/configurations/mtmitchell_mb.json
+++ b/configurations/mtmitchell_mb.json
@@ -2,7 +2,7 @@
     {
         "Exposes": [
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 0,
                 "Name": "S0_0V8_D2D",
                 "PollRate": 15,
@@ -13,42 +13,7 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 1.008
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 0.97
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 0.64
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower non critical",
-                        "Severity": 0,
-                        "Value": 0.68
-                    }
-                ],
-                "Type": "ADC"
-            },
-            {
-                "CPURequired": 2,
-                "Index": 1,
-                "Name": "S1_0V8_D2D",
-                "PollRate": 15,
-                "PowerState": "On",
-                "ScaleFactor": 1,
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1.008
+                        "Value": 1.01
                     },
                     {
                         "Direction": "greater than",
@@ -73,6 +38,41 @@
             },
             {
                 "CPURequired": 1,
+                "Index": 1,
+                "Name": "S1_0V8_D2D",
+                "PollRate": 15,
+                "PowerState": "On",
+                "ScaleFactor": 1,
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.01
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 0.97
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0.64
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 0.68
+                    }
+                ],
+                "Type": "ADC"
+            },
+            {
+                "CPURequired": 0,
                 "Index": 2,
                 "Name": "S0_0V85_SOC",
                 "PollRate": 15,
@@ -89,7 +89,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.978
+                        "Value": 0.98
                     },
                     {
                         "Direction": "less than",
@@ -107,7 +107,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 3,
                 "Name": "S1_0V85_SOC",
                 "PollRate": 15,
@@ -124,7 +124,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.978
+                        "Value": 0.98
                     },
                     {
                         "Direction": "less than",
@@ -142,7 +142,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 4,
                 "Name": "S0_0V85_RC_DDR0",
                 "PollRate": 15,
@@ -159,7 +159,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.978
+                        "Value": 0.98
                     },
                     {
                         "Direction": "less than",
@@ -177,7 +177,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 5,
                 "Name": "S1_0V85_RC_DDR0",
                 "PollRate": 15,
@@ -194,7 +194,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.978
+                        "Value": 0.98
                     },
                     {
                         "Direction": "less than",
@@ -212,7 +212,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 6,
                 "Name": "S0_0V85_RC_DDR1",
                 "PollRate": 15,
@@ -229,42 +229,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.978
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 0.68
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower non critical",
-                        "Severity": 0,
-                        "Value": 0.72
-                    }
-                ],
-                "Type": "ADC"
-            },
-            {
-                "CPURequired": 2,
-                "Index": 7,
-                "Name": "S1_0V85_RC_DDR1",
-                "PollRate": 15,
-                "PowerState": "ChassisOn",
-                "ScaleFactor": 1,
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1.02
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 0.978
+                        "Value": 0.98
                     },
                     {
                         "Direction": "less than",
@@ -283,6 +248,41 @@
             },
             {
                 "CPURequired": 1,
+                "Index": 7,
+                "Name": "S1_0V85_RC_DDR1",
+                "PollRate": 15,
+                "PowerState": "ChassisOn",
+                "ScaleFactor": 1,
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.02
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 0.98
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0.68
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 0.72
+                    }
+                ],
+                "Type": "ADC"
+            },
+            {
+                "CPURequired": 0,
                 "Index": 8,
                 "Name": "S0_0V9_RC5A",
                 "PollRate": 15,
@@ -317,7 +317,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 9,
                 "Name": "S1_0V9_RC5A",
                 "PollRate": 15,
@@ -352,7 +352,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 10,
                 "Name": "S0_1V8_RC5A",
                 "PollRate": 15,
@@ -387,7 +387,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 11,
                 "Name": "S1_1V8_RC5A",
                 "PollRate": 15,
@@ -422,7 +422,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 12,
                 "Name": "S0_1V2_SOC",
                 "PollRate": 15,
@@ -439,7 +439,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.38
+                        "Value": 1.384
                     },
                     {
                         "Direction": "less than",
@@ -457,7 +457,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 13,
                 "Name": "S1_1V2_SOC",
                 "PollRate": 15,
@@ -474,7 +474,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.38
+                        "Value": 1.384
                     },
                     {
                         "Direction": "less than",
@@ -492,7 +492,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 14,
                 "Name": "S0_EXT_VREF",
                 "PollRate": 15,
@@ -509,7 +509,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.714
+                        "Value": 0.715
                     },
                     {
                         "Direction": "less than",
@@ -521,13 +521,13 @@
                         "Direction": "less than",
                         "Name": "lower non critical",
                         "Severity": 0,
-                        "Value": 0.686
+                        "Value": 0.685
                     }
                 ],
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 15,
                 "Name": "S1_EXT_VREF",
                 "PollRate": 15,
@@ -544,7 +544,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 0.714
+                        "Value": 0.715
                     },
                     {
                         "Direction": "less than",
@@ -556,13 +556,13 @@
                         "Direction": "less than",
                         "Name": "lower non critical",
                         "Severity": 0,
-                        "Value": 0.686
+                        "Value": 0.685
                     }
                 ],
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 16,
                 "Name": "S0_1V1_VDDQ4567",
                 "PollRate": 15,
@@ -579,42 +579,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.265
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 0.876
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower non critical",
-                        "Severity": 0,
-                        "Value": 0.93
-                    }
-                ],
-                "Type": "ADC"
-            },
-            {
-                "CPURequired": 2,
-                "Index": 17,
-                "Name": "S1_1V1_VDDQ4567",
-                "PollRate": 15,
-                "PowerState": "ChassisOn",
-                "ScaleFactor": 1,
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1.32
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1.265
+                        "Value": 1.266
                     },
                     {
                         "Direction": "less than",
@@ -633,6 +598,41 @@
             },
             {
                 "CPURequired": 1,
+                "Index": 17,
+                "Name": "S1_1V1_VDDQ4567",
+                "PollRate": 15,
+                "PowerState": "ChassisOn",
+                "ScaleFactor": 1,
+                "Thresholds": [
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper critical",
+                        "Severity": 1,
+                        "Value": 1.32
+                    },
+                    {
+                        "Direction": "greater than",
+                        "Name": "upper non critical",
+                        "Severity": 0,
+                        "Value": 1.266
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower critical",
+                        "Severity": 1,
+                        "Value": 0.876
+                    },
+                    {
+                        "Direction": "less than",
+                        "Name": "lower non critical",
+                        "Severity": 0,
+                        "Value": 0.93
+                    }
+                ],
+                "Type": "ADC"
+            },
+            {
+                "CPURequired": 0,
                 "Index": 18,
                 "Name": "S0_1V8_SOC",
                 "PollRate": 15,
@@ -667,7 +667,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 19,
                 "Name": "S1_1V8_SOC",
                 "PollRate": 15,
@@ -702,7 +702,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 20,
                 "Name": "S0_0V75_PCP",
                 "PollRate": 15,
@@ -719,7 +719,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.208
+                        "Value": 1.211
                     },
                     {
                         "Direction": "less than",
@@ -731,13 +731,13 @@
                         "Direction": "less than",
                         "Name": "lower non critical",
                         "Severity": 0,
-                        "Value": 0.638
+                        "Value": 0.637
                     }
                 ],
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 21,
                 "Name": "S1_0V75_PCP",
                 "PollRate": 15,
@@ -754,7 +754,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.208
+                        "Value": 1.211
                     },
                     {
                         "Direction": "less than",
@@ -766,13 +766,13 @@
                         "Direction": "less than",
                         "Name": "lower non critical",
                         "Severity": 0,
-                        "Value": 0.638
+                        "Value": 0.637
                     }
                 ],
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 22,
                 "Name": "S0_1V1_VDDQ0123",
                 "PollRate": 15,
@@ -789,7 +789,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.265
+                        "Value": 1.266
                     },
                     {
                         "Direction": "less than",
@@ -807,7 +807,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 23,
                 "Name": "S1_1V1_VDDQ0123",
                 "PollRate": 15,
@@ -824,7 +824,7 @@
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 1.265
+                        "Value": 1.266
                     },
                     {
                         "Direction": "less than",
@@ -842,12 +842,6 @@
                 "Type": "ADC"
             },
             {
-                "BridgeGpio": [
-                    {
-                        "Name": "rtc-battery-voltage-read-enable",
-                        "Polarity": "High"
-                    }
-                ],
                 "Index": 24,
                 "Name": "VBAT_RTC",
                 "PollRate": 15,
@@ -916,7 +910,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 1,
+                "CPURequired": 0,
                 "Index": 26,
                 "Name": "12V_S0",
                 "PollRate": 15,
@@ -951,7 +945,7 @@
                 "Type": "ADC"
             },
             {
-                "CPURequired": 2,
+                "CPURequired": 1,
                 "Index": 27,
                 "Name": "12V_S1",
                 "PollRate": 15,
@@ -2056,6 +2050,10 @@
                 "Type": "I2CFan"
             },
             {
+                "Name": "MB Upstream Port",
+                "Type": "MB Upstream Port"
+            },
+            {
                 "Name": "NVMeM2_MaxTemp",
                 "Sensors": [
                     "m2nvme0",
@@ -2245,18 +2243,23 @@
             "UUID": "$MULTIRECORD_UUID"
         },
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+            "BuildDate": "$BOARD_MANUFACTURE_DATE",
+            "Manufacturer": "$PRODUCT_MANUFACTURER",
+            "Model": "$PRODUCT_PRODUCT_NAME $PRODUCT_VERSION",
+            "PartNumber": "$PRODUCT_PART_NUMBER",
+            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+        },
+        "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+            "AssetTag": "$PRODUCT_ASSET_TAG"
         },
         "xyz.openbmc_project.Inventory.Decorator.Compatible": {
             "Names": [
                 "com.ampere.Hardware.Chassis.Model.MtMitchell"
             ]
         },
-        "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
-            "MACAddress": "$BOARD_INFO_AM1"
-        }
+        "xyz.openbmc_project.Inventory.Decorator.Revision": {
+            "Version": "$PRODUCT_VERSION"
+        },
+        "xyz.openbmc_project.Inventory.Item.System": {}
     }
 ]