diff --git a/configurations/sbp1_baseboard.json b/configurations/sbp1_baseboard.json
index ae6e3c3..be30f3f 100644
--- a/configurations/sbp1_baseboard.json
+++ b/configurations/sbp1_baseboard.json
@@ -5856,28 +5856,28 @@
         {
             "Address": "0x30",
             "Bus": 0,
-            "CpuID": 1,
+            "CpuID": 0,
             "Name": "CPU 0",
             "Type": "XeonCPU"
         },
         {
             "Address": "0x31",
             "Bus": 0,
-            "CpuID": 2,
+            "CpuID": 1,
             "Name": "CPU 1",
             "Type": "XeonCPU"
         },
         {
             "Address": "0x32",
             "Bus": 0,
-            "CpuID": 3,
+            "CpuID": 2,
             "Name": "CPU 2",
             "Type": "XeonCPU"
         },
         {
             "Address": "0x33",
             "Bus": 0,
-            "CpuID": 4,
+            "CpuID": 3,
             "Name": "CPU 3",
             "Type": "XeonCPU"
         }
diff --git a/configurations/sbp1_chassis.json b/configurations/sbp1_chassis.json
index a9c9c9b..892510f 100644
--- a/configurations/sbp1_chassis.json
+++ b/configurations/sbp1_chassis.json
@@ -1598,10 +1598,10 @@
             "ILimitMin": 2500,
             "InputUnavailableAsFailed": false,
             "Inputs": [
+                "Die_CPU0",
                 "Die_CPU1",
                 "Die_CPU2",
-                "Die_CPU3",
-                "Die_CPU4"
+                "Die_CPU3"
             ],
             "Name": "CPU Temperature",
             "NegativeHysteresis": 0,
@@ -1729,6 +1729,47 @@
             "ILimitMin": 2500,
             "InputUnavailableAsFailed": false,
             "Inputs": [
+                "DIMM_A1_CPU0",
+                "DIMM_A2_CPU0",
+                "DIMM_B1_CPU0",
+                "DIMM_B2_CPU0",
+                "DIMM_C1_CPU0",
+                "DIMM_C2_CPU0",
+                "DIMM_D1_CPU0",
+                "DIMM_D2_CPU0",
+                "DIMM_E1_CPU0",
+                "DIMM_E2_CPU0",
+                "DIMM_F1_CPU0",
+                "DIMM_F2_CPU0",
+                "DIMM_G1_CPU0",
+                "DIMM_G2_CPU0",
+                "DIMM_H1_CPU0",
+                "DIMM_H2_CPU0"
+            ],
+            "Name": "CPU0 VR Temperature",
+            "NegativeHysteresis": 0,
+            "OutLimitMax": 18000,
+            "OutLimitMin": 2500,
+            "Outputs": [],
+            "PCoefficient": -500,
+            "PositiveHysteresis": 0,
+            "SetPoint": 60,
+            "SlewNeg": 0,
+            "SlewPos": 0,
+            "Type": "Pid",
+            "Zones": [
+                "PSU"
+            ]
+        },
+        {
+            "Class": "temp",
+            "FFGainCoefficient": 0,
+            "FFOffCoefficient": 0,
+            "ICoefficient": -5,
+            "ILimitMax": 18000,
+            "ILimitMin": 2500,
+            "InputUnavailableAsFailed": false,
+            "Inputs": [
                 "DIMM_A1_CPU1",
                 "DIMM_A2_CPU1",
                 "DIMM_B1_CPU1",
@@ -1852,47 +1893,6 @@
             "ILimitMin": 2500,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "DIMM_A1_CPU4",
-                "DIMM_A2_CPU4",
-                "DIMM_B1_CPU4",
-                "DIMM_B2_CPU4",
-                "DIMM_C1_CPU4",
-                "DIMM_C2_CPU4",
-                "DIMM_D1_CPU4",
-                "DIMM_D2_CPU4",
-                "DIMM_E1_CPU4",
-                "DIMM_E2_CPU4",
-                "DIMM_F1_CPU4",
-                "DIMM_F2_CPU4",
-                "DIMM_G1_CPU4",
-                "DIMM_G2_CPU4",
-                "DIMM_H1_CPU4",
-                "DIMM_H2_CPU4"
-            ],
-            "Name": "CPU4 VR Temperature",
-            "NegativeHysteresis": 0,
-            "OutLimitMax": 18000,
-            "OutLimitMin": 2500,
-            "Outputs": [],
-            "PCoefficient": -500,
-            "PositiveHysteresis": 0,
-            "SetPoint": 60,
-            "SlewNeg": 0,
-            "SlewPos": 0,
-            "Type": "Pid",
-            "Zones": [
-                "PSU"
-            ]
-        },
-        {
-            "Class": "temp",
-            "FFGainCoefficient": 0,
-            "FFOffCoefficient": 0,
-            "ICoefficient": -5,
-            "ILimitMax": 18000,
-            "ILimitMin": 2500,
-            "InputUnavailableAsFailed": false,
-            "Inputs": [
                 "P1V05_PCH_AUX Temperature",
                 "P1V8_PCH_AUX Temperature"
             ],