diff --git a/configurations/meson.build b/configurations/meson.build
index 1294696..9aaae03 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -65,7 +65,8 @@
     'meta/catalina_hdd.json',
     'meta/catalina_hdd_nvme.json',
     'meta/catalina_osfp.json',
-    'meta/catalina_pdb.json',
+    'meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json',
+    'meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json',
     'meta/catalina_scm.json',
     'meta/fbtp.json',
     'meta/fbyv2.json',
diff --git a/configurations/meta/catalina_pdb.json b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
similarity index 98%
rename from configurations/meta/catalina_pdb.json
rename to configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
index 842bede..433fff2 100644
--- a/configurations/meta/catalina_pdb.json
+++ b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
@@ -1038,7 +1038,11 @@
         }
     ],
     "Name": "Catalina PDB",
-    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
+        "AND",
+        "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-ltc fsc-max vr-raa gndsen-ina p12vsen-ina p12vfan-mps'})"
+    ],
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/catalina_pdb.json b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
similarity index 86%
copy from configurations/meta/catalina_pdb.json
copy to configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
index 842bede..a535bec 100644
--- a/configurations/meta/catalina_pdb.json
+++ b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
@@ -7,28 +7,30 @@
             "Type": "EEPROM"
         },
         {
-            "Address": "0x21",
+            "Address": "0x01",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN0_TACH_IL",
                 "Pwm": 0,
                 "PwmName": "FAN0_PWM",
                 "Tachs": [
-                    0
+                    9
                 ]
             },
-            "Index": 0,
+            "Index": 9,
             "Name": "FAN0_TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 726,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 36300
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 51,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 2550
@@ -37,28 +39,30 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x21",
+            "Address": "0x01",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN0_TACH_OL",
                 "Pwm": 0,
                 "PwmName": "FAN0_PWM",
                 "Tachs": [
-                    1
+                    11
                 ]
             },
-            "Index": 1,
+            "Index": 11,
             "Name": "FAN0_TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 660,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 33000
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 39.2,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 1960
@@ -67,148 +71,30 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x21",
+            "Address": "0x01",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN1_TACH_IL",
-                "Pwm": 2,
+                "Pwm": 4,
                 "PwmName": "FAN1_PWM",
                 "Tachs": [
-                    7
-                ]
-            },
-            "Index": 7,
-            "Name": "FAN1_TACH_IL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 36300
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 2550
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x21",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN1_TACH_OL",
-                "Pwm": 2,
-                "PwmName": "FAN1_PWM",
-                "Tachs": [
-                    2
-                ]
-            },
-            "Index": 2,
-            "Name": "FAN1_TACH_OL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 33000
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1960
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x21",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN2_TACH_IL",
-                "Pwm": 3,
-                "PwmName": "FAN2_PWM",
-                "Tachs": [
-                    3
-                ]
-            },
-            "Index": 3,
-            "Name": "FAN2_TACH_IL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 36300
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 2550
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x21",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN2_TACH_OL",
-                "Pwm": 3,
-                "PwmName": "FAN2_PWM",
-                "Tachs": [
-                    4
-                ]
-            },
-            "Index": 4,
-            "Name": "FAN2_TACH_OL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 33000
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1960
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x21",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN3_TACH_IL",
-                "Pwm": 5,
-                "PwmName": "FAN3_PWM",
-                "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FAN3_TACH_IL_SPEED_RPM",
+            "Name": "FAN1_TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 726,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 36300
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 51,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 2550
@@ -217,28 +103,30 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x21",
+            "Address": "0x01",
             "Bus": 18,
             "Connector": {
-                "Name": "FAN3_TACH_OL",
-                "Pwm": 5,
-                "PwmName": "FAN3_PWM",
+                "Name": "FAN1_TACH_OL",
+                "Pwm": 4,
+                "PwmName": "FAN1_PWM",
                 "Tachs": [
-                    5
+                    13
                 ]
             },
-            "Index": 5,
-            "Name": "FAN3_TACH_OL_SPEED_RPM",
+            "Index": 13,
+            "Name": "FAN1_TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 660,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 33000
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 39.2,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 1960
@@ -247,28 +135,158 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x27",
+            "Address": "0x01",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN2_TACH_IL",
+                "Pwm": 6,
+                "PwmName": "FAN2_PWM",
+                "Tachs": [
+                    15
+                ]
+            },
+            "Index": 15,
+            "Name": "FAN2_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x01",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN2_TACH_OL",
+                "Pwm": 6,
+                "PwmName": "FAN2_PWM",
+                "Tachs": [
+                    1
+                ]
+            },
+            "Index": 1,
+            "Name": "FAN2_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x01",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN3_TACH_IL",
+                "Pwm": 10,
+                "PwmName": "FAN3_PWM",
+                "Tachs": [
+                    0
+                ]
+            },
+            "Index": 0,
+            "Name": "FAN3_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x01",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN3_TACH_OL",
+                "Pwm": 10,
+                "PwmName": "FAN3_PWM",
+                "Tachs": [
+                    3
+                ]
+            },
+            "Index": 3,
+            "Name": "FAN3_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x02",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN4_TACH_IL",
                 "Pwm": 0,
                 "PwmName": "FAN4_PWM",
                 "Tachs": [
-                    0
+                    9
                 ]
             },
-            "Index": 0,
+            "Index": 9,
             "Name": "FAN4_TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 726,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 36300
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 51,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 2550
@@ -277,28 +295,30 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x27",
+            "Address": "0x02",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN4_TACH_OL",
                 "Pwm": 0,
                 "PwmName": "FAN4_PWM",
                 "Tachs": [
-                    1
+                    11
                 ]
             },
-            "Index": 1,
+            "Index": 11,
             "Name": "FAN4_TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 660,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 33000
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 39.2,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 1960
@@ -307,148 +327,30 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x27",
+            "Address": "0x02",
             "Bus": 18,
             "Connector": {
                 "Name": "FAN5_TACH_IL",
-                "Pwm": 2,
+                "Pwm": 4,
                 "PwmName": "FAN5_PWM",
                 "Tachs": [
-                    7
-                ]
-            },
-            "Index": 7,
-            "Name": "FAN5_TACH_IL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 36300
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 2550
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x27",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN5_TACH_OL",
-                "Pwm": 2,
-                "PwmName": "FAN5_PWM",
-                "Tachs": [
-                    2
-                ]
-            },
-            "Index": 2,
-            "Name": "FAN5_TACH_OL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 33000
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1960
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x27",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN6_TACH_IL",
-                "Pwm": 3,
-                "PwmName": "FAN6_PWM",
-                "Tachs": [
-                    3
-                ]
-            },
-            "Index": 3,
-            "Name": "FAN6_TACH_IL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 36300
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 2550
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x27",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN6_TACH_OL",
-                "Pwm": 3,
-                "PwmName": "FAN6_PWM",
-                "Tachs": [
-                    4
-                ]
-            },
-            "Index": 4,
-            "Name": "FAN6_TACH_OL_SPEED_RPM",
-            "PowerState": "Always",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 33000
-                },
-                {
-                    "Direction": "less than",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1960
-                }
-            ],
-            "Type": "I2CFan"
-        },
-        {
-            "Address": "0x27",
-            "Bus": 18,
-            "Connector": {
-                "Name": "FAN7_TACH_IL",
-                "Pwm": 5,
-                "PwmName": "FAN7_PWM",
-                "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FAN7_TACH_IL_SPEED_RPM",
+            "Name": "FAN5_TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 726,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 36300
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 51,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 2550
@@ -457,28 +359,158 @@
             "Type": "I2CFan"
         },
         {
-            "Address": "0x27",
+            "Address": "0x02",
             "Bus": 18,
             "Connector": {
-                "Name": "FAN7_TACH_OL",
-                "Pwm": 5,
-                "PwmName": "FAN7_PWM",
+                "Name": "FAN5_TACH_OL",
+                "Pwm": 4,
+                "PwmName": "FAN5_PWM",
                 "Tachs": [
-                    5
+                    13
                 ]
             },
-            "Index": 5,
-            "Name": "FAN7_TACH_OL_SPEED_RPM",
+            "Index": 13,
+            "Name": "FAN5_TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
                     "Direction": "greater than",
+                    "Hysteresis": 660,
                     "Name": "upper critical",
                     "Severity": 1,
                     "Value": 33000
                 },
                 {
                     "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x02",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN6_TACH_IL",
+                "Pwm": 6,
+                "PwmName": "FAN6_PWM",
+                "Tachs": [
+                    15
+                ]
+            },
+            "Index": 15,
+            "Name": "FAN6_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x02",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN6_TACH_OL",
+                "Pwm": 6,
+                "PwmName": "FAN6_PWM",
+                "Tachs": [
+                    1
+                ]
+            },
+            "Index": 1,
+            "Name": "FAN6_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x02",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN7_TACH_IL",
+                "Pwm": 10,
+                "PwmName": "FAN7_PWM",
+                "Tachs": [
+                    0
+                ]
+            },
+            "Index": 0,
+            "Name": "FAN7_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x02",
+            "Bus": 18,
+            "Connector": {
+                "Name": "FAN7_TACH_OL",
+                "Pwm": 10,
+                "PwmName": "FAN7_PWM",
+                "Tachs": [
+                    3
+                ]
+            },
+            "Index": 3,
+            "Name": "FAN7_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
                     "Name": "lower critical",
                     "Severity": 1,
                     "Value": 1960
@@ -490,7 +522,7 @@
             "Address": "0x41",
             "Bus": 16,
             "Labels": [
-                "in1",
+                "in0",
                 "curr1",
                 "power1",
                 "temp1"
@@ -514,21 +546,21 @@
                     "Value": 10.56
                 }
             ],
-            "Type": "INA238",
+            "Type": "ISL28022",
             "curr1_Name": "PDB_P12V_NIC0_CURR_A",
-            "curr1_Offset": -0.0002,
-            "curr1_Scale": 57.957575055,
-            "in1_Name": "PDB_P12V_NIC0_VOLT_V",
+            "curr1_Offset": -0.0441,
+            "curr1_Scale": 57.954216169,
+            "in0_Name": "PDB_P12V_NIC0_VOLT_V",
             "power1_Name": "PDB_P12V_NIC0_PWR_W",
-            "power1_Offset": 0.0022,
-            "power1_Scale": 58031.56917363,
+            "power1_Offset": -0.5614,
+            "power1_Scale": 58958.787807323,
             "temp1_Name": "PDB_P12V_NIC0_TEMP_C"
         },
         {
             "Address": "0x42",
             "Bus": 16,
             "Labels": [
-                "in1",
+                "in0",
                 "curr1",
                 "power1",
                 "temp1"
@@ -552,21 +584,21 @@
                     "Value": 10.56
                 }
             ],
-            "Type": "INA238",
+            "Type": "ISL28022",
             "curr1_Name": "PDB_P12V_NIC1_CURR_A",
-            "curr1_Offset": 0.0004,
-            "curr1_Scale": 54.083288264,
-            "in1_Name": "PDB_P12V_NIC1_VOLT_V",
+            "curr1_Offset": -0.0413,
+            "curr1_Scale": 53.989849908,
+            "in0_Name": "PDB_P12V_NIC1_VOLT_V",
             "power1_Name": "PDB_P12V_NIC1_PWR_W",
-            "power1_Offset": 0.0032,
-            "power1_Scale": 54077.438892494,
+            "power1_Offset": -0.4173,
+            "power1_Scale": 54878.718033147,
             "temp1_Name": "PDB_P12V_NIC1_TEMP_C"
         },
         {
             "Address": "0x44",
             "Bus": 16,
             "Labels": [
-                "in1",
+                "in0",
                 "curr1",
                 "power1",
                 "temp1"
@@ -590,39 +622,39 @@
                     "Value": 10.5
                 }
             ],
-            "Type": "INA238",
+            "Type": "ISL28022",
             "curr1_Name": "PDB_P12V_SCM_CURR_A",
-            "curr1_Offset": 8e-05,
-            "curr1_Scale": 51.030822617,
-            "in1_Name": "PDB_P12V_SCM_VOLT_V",
+            "curr1_Offset": 0.0647,
+            "curr1_Scale": 49.887752557,
+            "in0_Name": "PDB_P12V_SCM_VOLT_V",
             "power1_Name": "PDB_P12V_SCM_PWR_W",
-            "power1_Offset": -0.0102,
-            "power1_Scale": 50875.050875051,
+            "power1_Offset": 1.9474,
+            "power1_Scale": 52358.762238861,
             "temp1_Name": "PDB_P12V_SCM_TEMP_C"
         },
         {
             "Address": "0x43",
             "Bus": 17,
             "Labels": [
-                "in0"
+                "in1"
             ],
             "Name": "PDB_POSITIVE_VDROP",
-            "Type": "INA238",
-            "in0_Max": 1,
-            "in0_Min": -1,
-            "in0_Name": "PDB_POSITIVE_VDROP_VOLT_V"
+            "Type": "ISL28022",
+            "in1_Max": 1,
+            "in1_Min": -1,
+            "in1_Name": "PDB_POSITIVE_VDROP_VOLT_V"
         },
         {
             "Address": "0x41",
             "Bus": 17,
             "Labels": [
-                "in0"
+                "in1"
             ],
             "Name": "PDB_RETURN_VDROP",
-            "Type": "INA238",
-            "in0_Max": 1,
-            "in0_Min": -1,
-            "in0_Name": "PDB_RETURN_VDROP_VOLT_V"
+            "Type": "ISL28022",
+            "in1_Max": 1,
+            "in1_Min": -1,
+            "in1_Name": "PDB_RETURN_VDROP_VOLT_V"
         },
         {
             "Address": "0x44",
@@ -631,7 +663,7 @@
                 "curr1"
             ],
             "Name": "PDB_CABLE_TSENSE_POSITIVE",
-            "Type": "INA238",
+            "Type": "ISL28022",
             "curr1_Max": 0.1,
             "curr1_Min": 0,
             "curr1_Name": "PDB_CABLE_TSENSE_POSITIVE_CURR_A",
@@ -644,157 +676,13 @@
                 "curr1"
             ],
             "Name": "PDB_CABLE_TSENSE_NEGATIVE",
-            "Type": "INA238",
+            "Type": "ISL28022",
             "curr1_Max": 0.1,
             "curr1_Min": 0,
             "curr1_Name": "PDB_CABLE_TSENSE_NEGATIVE_CURR_A",
             "curr1_Scale": 50000
         },
         {
-            "Address": "0x42",
-            "Bus": 20,
-            "Labels": [
-                "iout1",
-                "pin",
-                "temp1",
-                "vin",
-                "vout1"
-            ],
-            "Name": "PDB_P48V_HSC1",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.6,
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 80.0
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.1,
-                    "Label": "temp1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 5
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.186,
-                    "Label": "vin",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 59.3
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.782,
-                    "Label": "vin",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 39.1
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.186,
-                    "Label": "vout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 59.3
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.782,
-                    "Label": "vout1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 39.1
-                }
-            ],
-            "Type": "LTC4287",
-            "iout1_Name": "PDB_P48V_HSC1_CURR_A",
-            "iout1_Offset": -0.1819,
-            "iout1_Scale": 1061.796559779,
-            "pin_Name": "PDB_P48V_HSC1_PWR_W",
-            "pin_Offset": -8.9115,
-            "pin_Scale": 1062699.256110521,
-            "temp1_Name": "PDB_P48V_HSC1_TEMP_C",
-            "vin_Name": "PDB_P48V_HSC1_VIN_VOLT_V",
-            "vout1_Name": "PDB_P48V_HSC1_VOUT_VOLT_V"
-        },
-        {
-            "Address": "0x43",
-            "Bus": 20,
-            "Labels": [
-                "iout1",
-                "pin",
-                "temp1",
-                "vin",
-                "vout1"
-            ],
-            "Name": "PDB_P48V_HSC2",
-            "Thresholds": [
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.6,
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 80.0
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.1,
-                    "Label": "temp1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 5
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.186,
-                    "Label": "vin",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 59.3
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.782,
-                    "Label": "vin",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 39.1
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.186,
-                    "Label": "vout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 59.3
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.782,
-                    "Label": "vout1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 39.1
-                }
-            ],
-            "Type": "LTC4287",
-            "iout1_Name": "PDB_P48V_HSC2_CURR_A",
-            "iout1_Offset": -0.274,
-            "iout1_Scale": 1053.907361543,
-            "pin_Name": "PDB_P48V_HSC2_PWR_W",
-            "pin_Offset": -13.862,
-            "pin_Scale": 1054129.552522005,
-            "temp1_Name": "PDB_P48V_HSC2_TEMP_C",
-            "vin_Name": "PDB_P48V_HSC2_VIN_VOLT_V",
-            "vout1_Name": "PDB_P48V_HSC2_VOUT_VOLT_V"
-        },
-        {
             "Address": "0x22",
             "Bus": 16,
             "Labels": [
@@ -872,7 +760,6 @@
                 "vout1"
             ],
             "Name": "PDB_VR_P12V_N1",
-            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -923,7 +810,6 @@
                 "vout1"
             ],
             "Name": "PDB_VR_P12V_N2",
-            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1035,10 +921,158 @@
                 }
             ],
             "Type": "TMP75"
+        },
+        {
+            "Address": "0x13",
+            "Bus": 20,
+            "Labels": [
+                "iout1",
+                "pin",
+                "temp1",
+                "vin",
+                "vout1"
+            ],
+            "Name": "PDB_P48V_HSC1",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.6,
+                    "Label": "temp1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 80.0
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.1,
+                    "Label": "temp1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 5
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.186,
+                    "Label": "vin",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 59.3
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.782,
+                    "Label": "vin",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 39.1
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.186,
+                    "Label": "vout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 59.3
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.782,
+                    "Label": "vout1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 39.1
+                }
+            ],
+            "Type": "XDP710",
+            "iout1_Name": "PDB_P48V_HSC1_CURR_A",
+            "iout1_Offset": 0.1237,
+            "iout1_Scale": 524.521374246,
+            "pin_Name": "PDB_P48V_HSC1_PWR_W",
+            "pin_Offset": 4.9469,
+            "pin_Scale": 524851.729386448,
+            "temp1_Name": "PDB_P48V_HSC1_TEMP_C",
+            "vin_Name": "PDB_P48V_HSC1_VIN_VOLT_V",
+            "vout1_Name": "PDB_P48V_HSC1_VOUT_VOLT_V"
+        },
+        {
+            "Address": "0x1C",
+            "Bus": 20,
+            "Labels": [
+                "iout1",
+                "pin",
+                "temp1",
+                "vin",
+                "vout1"
+            ],
+            "Name": "PDB_P48V_HSC2",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.6,
+                    "Label": "temp1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 80.0
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.1,
+                    "Label": "temp1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 5
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.186,
+                    "Label": "vin",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 59.3
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.782,
+                    "Label": "vin",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 39.1
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.186,
+                    "Label": "vout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 59.3
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.782,
+                    "Label": "vout1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 39.1
+                }
+            ],
+            "Type": "XDP710",
+            "iout1_Name": "PDB_P48V_HSC2_CURR_A",
+            "iout1_Offset": 0.2143,
+            "iout1_Scale": 525.596552087,
+            "pin_Name": "PDB_P48V_HSC2_PWR_W",
+            "pin_Offset": 10.762,
+            "pin_Scale": 525983.589312013,
+            "temp1_Name": "PDB_P48V_HSC2_TEMP_C",
+            "vin_Name": "PDB_P48V_HSC2_VIN_VOLT_V",
+            "vout1_Name": "PDB_P48V_HSC2_VOUT_VOLT_V"
         }
     ],
     "Name": "Catalina PDB",
-    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina PDB '})",
+        "AND",
+        "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-xdp fsc-nct vr-raa gndsen-max p12vsen-isl p12vfan-rtt'})"
+    ],
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "BuildDate": "$BOARD_MANUFACTURE_DATE",