diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 94fd6d3..4331ce4 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -2,9 +2,9 @@
     {
         "Exposes": [
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -59,14 +59,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -80,9 +80,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0, 100.0
@@ -99,240 +99,12 @@
             {
                 "Address": "$address",
                 "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
+                "Name": "PSU$ADDRESS % 4 + 1 FRU",
                 "Type": "EEPROM"
             }
         ],
-        "Name": "Delta DPS-750XB PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 954.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 900
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 112
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Delta DPS-750XB PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 954.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 900
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 112
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Delta DPS-750XB PSU FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Delta DPS-750XB PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
+        "Name": "Delta DPS-750XB PSU$ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 89da7e1..2a05b90 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -2,9 +2,62 @@
     {
         "Exposes": [
             {
-                "Address": "0x5a",
+                "Address": "$address",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU $ADDRESS % 4 + 1 FRU",
+                "Type": "EEPROM"
+            },
+            {
+                "Class": "fan",
+                "FFGainCoefficient": 0.01,
+                "FFOffCoefficient": 0.0,
+                "ICoefficient": 0.0,
+                "ILimitMax": 0.0,
+                "ILimitMin": 0.0,
+                "Inputs": [
+                    "PSU $ADDRESS % 4 + 1 Fan Speed 1"
+                ],
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
+                "NegativeHysteresis": 2.0,
+                "OutLimitMax": 100.0,
+                "OutLimitMin": 30.0,
+                "Outputs": [
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
+                ],
+                "PCoefficient": 0.0,
+                "PositiveHysteresis": 0.0,
+                "SlewNeg": 0.0,
+                "SlewPos": 0.0,
+                "Type": "Pid",
+                "Zones": [
+                    "PSU"
+                ]
+            },
+            {
+                "Class": "Floor",
+                "Inputs": [
+                    "PSU$ADDRESS % 4 + 1 Temperature"
+                ],
+                "Name": "PSU $ADDRESS % 4 + 1 LCC",
+                "NegativeHysteresis": 2,
+                "Output": [
+                    40.0,
+                    100.0
+                ],
+                "PositiveHysteresis": 0,
+                "Reading": [
+                    30.0,
+                    65.0
+                ],
+                "Type": "Stepwise",
+                "Zones": [
+                    "PSU"
+                ]
+            },
+            {
+                "Address": "$ADDRESS % 4 + 88",
+                "Bus": "$bus",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -50,289 +103,10 @@
                     }
                 ],
                 "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU3 Fan Speed 1"
-                ],
-                "Name": "PSU3 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU3 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU3 Temperature"
-                ],
-                "Name": "PSU3 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
             }
         ],
-        "Name": "Flextronics S-1100ADU00-201 PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1516.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1364.8
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 125
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Flextronics S-1100ADU00-201 PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1516.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1364.8
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 125
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Flextronics S-1100ADU00-201 PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
+        "Name": "Flextronics S-1100ADU00-201 PSU $ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -341,4 +115,4 @@
             "SerialNumber": "$BOARD_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index 823732b..b8206c3 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -2,9 +2,9 @@
     {
         "Exposes": [
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -59,14 +59,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -80,9 +80,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0, 100.0
@@ -99,241 +99,12 @@
             {
                 "Address": "$address",
                 "Bus": "$bus",
-                "Name": "Solum 1300W PSU 3 FRU",
+                "Name": "Solum 1300W PSU$ADDRESS % 4 + 1 FRU",
                 "Type": "EEPROM"
             }
         ],
-        "Name": "Solum 1300W PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-
-    {
-        "Exposes": [
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1648.4
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1536.3
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 115
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1300W PSU 2 FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Solum 1300W PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 1648.4
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1536.3
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 115
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 62
-                    }
-                ],
-                "Type": "pmbus"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0, 100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0, 65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1300W PSU 1 FRU",
-                "Type": "EEPROM"
-            }
-        ],
-        "Name": "Solum 1300W PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
+        "Name": "Solum 1300W PSU$ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/PSSF162205A.json b/configurations/PSSF162205A.json
index 965c5ce..5594548 100644
--- a/configurations/PSSF162205A.json
+++ b/configurations/PSSF162205A.json
@@ -15,14 +15,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -36,9 +36,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0,
@@ -55,9 +55,9 @@
                 ]
             },
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -105,239 +105,7 @@
                 "Type": "pmbus"
             }
         ],
-        "Name": "Solum 1600W PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF162205A', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1600W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2149.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1951.6
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 122
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 78
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 73
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 1600W PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF162205A', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 1600W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2149.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1951.6
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 122
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 78
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 73
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 1600W PSU 1",
+        "Name": "Solum 1600W PSU$ADDRESS % 4 + 1",
         "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF162205A', 'ADDRESS': 80})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -347,4 +115,4 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF212201A.json b/configurations/PSSF212201A.json
index 23421fe..aaa14a6 100644
--- a/configurations/PSSF212201A.json
+++ b/configurations/PSSF212201A.json
@@ -15,14 +15,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -36,9 +36,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0,
@@ -55,9 +55,9 @@
                 ]
             },
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -105,240 +105,8 @@
                 "Type": "pmbus"
             }
         ],
-        "Name": "Solum 2100W PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF212201A', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 2100W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2769.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 2558.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 117
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 60
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 2100W PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF212201A', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 2100W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2769.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 2558.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 117
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 60
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 2100W PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF212201A', 'ADDRESS': 80})",
+        "Name": "Solum 2100W PSU$ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF212201A'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
@@ -347,4 +115,4 @@
             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/configurations/PSSF222201A.json b/configurations/PSSF222201A.json
index 035fe03..6c17aa5 100644
--- a/configurations/PSSF222201A.json
+++ b/configurations/PSSF222201A.json
@@ -15,14 +15,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -36,9 +36,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0,
@@ -55,9 +55,9 @@
                 ]
             },
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -105,240 +105,8 @@
                 "Type": "pmbus"
             }
         ],
-        "Name": "Solum 2130W PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 2130W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2769.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 2558.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 117
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 60
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 2130W PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$PRODUCT_MANUFACTURER",
-            "Model": "$PRODUCT_PRODUCT_NAME",
-            "PartNumber": "$PRODUCT_PART_NUMBER",
-            "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "Solum 2130W PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2769.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 2558.2
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 117
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 65
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 60
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "Solum 2130W PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 80})",
+        "Name": "Solum 2130W PSU$ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 6572002..15d2efb 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -15,14 +15,14 @@
                 "ILimitMax": 0.0,
                 "ILimitMin": 0.0,
                 "Inputs": [
-                    "PSU3 Fan Speed 1"
+                    "PSU$ADDRESS % 4 + 1 Fan Speed 1"
                 ],
-                "Name": "PSU3 Fan 1",
+                "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
                 "NegativeHysteresis": 2.0,
                 "OutLimitMax": 100.0,
                 "OutLimitMin": 30.0,
                 "Outputs": [
-                    "Pwm PSU3 Fan 1"
+                    "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
                 ],
                 "PCoefficient": 0.0,
                 "PositiveHysteresis": 0.0,
@@ -36,9 +36,9 @@
             {
                 "Class": "Floor",
                 "Inputs": [
-                    "PSU3 Temperature"
+                    "PSU$ADDRESS % 4 + 1 Temperature"
                 ],
-                "Name": "PSU3 LCC",
+                "Name": "PSU$ADDRESS % 4 + 1 LCC",
                 "NegativeHysteresis": 2,
                 "Output": [
                     40.0,
@@ -55,9 +55,9 @@
                 ]
             },
             {
-                "Address": "0x5a",
+                "Address": "$ADDRESS % 4 + 88",
                 "Bus": "$bus",
-                "Name": "PSU3",
+                "Name": "PSU$ADDRESS % 4 + 1",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -105,240 +105,8 @@
                 "Type": "pmbus"
             }
         ],
-        "Name": "SOLUM CO IS162F22 PSU 3",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 82})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "SOLUM CO IS162F22 PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU2 Fan Speed 1"
-                ],
-                "Name": "PSU2 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU2 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU2 Temperature"
-                ],
-                "Name": "PSU2 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x59",
-                "Bus": "$bus",
-                "Name": "PSU2",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2149.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1951.6
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 122
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 78
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 73
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "SOLUM CO IS162F22 PSU 2",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 81})",
-        "Type": "PowerSupply",
-        "xyz.openbmc_project.Inventory.Decorator.Asset": {
-            "Manufacturer": "$BOARD_MANUFACTURER",
-            "Model": "$BOARD_PRODUCT_NAME",
-            "PartNumber": "$BOARD_PART_NUMBER",
-            "SerialNumber": "$BOARD_SERIAL_NUMBER"
-        }
-    },
-    {
-        "Exposes": [
-            {
-                "Address": "$address",
-                "Bus": "$bus",
-                "Name": "SOLUM CO IS162F22 PSU FRU",
-                "Type": "EEPROM"
-            },
-            {
-                "Class": "fan",
-                "FFGainCoefficient": 0.01,
-                "FFOffCoefficient": 0.0,
-                "ICoefficient": 0.0,
-                "ILimitMax": 0.0,
-                "ILimitMin": 0.0,
-                "Inputs": [
-                    "PSU1 Fan Speed 1"
-                ],
-                "Name": "PSU1 Fan 1",
-                "NegativeHysteresis": 2.0,
-                "OutLimitMax": 100.0,
-                "OutLimitMin": 30.0,
-                "Outputs": [
-                    "Pwm PSU1 Fan 1"
-                ],
-                "PCoefficient": 0.0,
-                "PositiveHysteresis": 0.0,
-                "SlewNeg": 0.0,
-                "SlewPos": 0.0,
-                "Type": "Pid",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Class": "Floor",
-                "Inputs": [
-                    "PSU1 Temperature"
-                ],
-                "Name": "PSU1 LCC",
-                "NegativeHysteresis": 2,
-                "Output": [
-                    40.0,
-                    100.0
-                ],
-                "PositiveHysteresis": 0,
-                "Reading": [
-                    30.0,
-                    65.0
-                ],
-                "Type": "Stepwise",
-                "Zones": [
-                    "PSU"
-                ]
-            },
-            {
-                "Address": "0x58",
-                "Bus": "$bus",
-                "Name": "PSU1",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 2149.5
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "pin",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 1951.6
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 122
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "iout1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 100
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 78
-                    },
-                    {
-                        "Direction": "greater than",
-                        "Label": "temp1",
-                        "Name": "upper non critical",
-                        "Severity": 0,
-                        "Value": 73
-                    }
-                ],
-                "Type": "pmbus"
-            }
-        ],
-        "Name": "SOLUM CO IS162F22 PSU 1",
-        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
+        "Name": "SOLUM CO IS162F22 PSU$ADDRESS % 4 + 1",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*'})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",