diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 620203f..e094ba9 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -671,7 +671,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 57.0,
+         "state": 60.0,
          "delta": 200
        },
        {
@@ -839,7 +839,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 54.0,
+         "state": 57.0,
          "delta": 50
        },
        {
@@ -1029,6 +1029,42 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
+                    "floor": 4000
+                  },
+                  {
+                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
+                    "floor": 4000
+                  },
+                  {
+                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
+                    "floor": 4000
+                  },
+                  {
+                    // OEM == MaximumPerformance
+                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
+                    "floor": 4000
+                  }
+                ]
+              },
+              {
+                "parameter": "pcie_floor_index",
+                "floors": [
+                  { "value": 1, "floor": 6000 },
+                  { "value": 2, "floor": 7000 },
+                  { "value": 3, "floor": 8000 }
+                ]
+              }
+            ]
+          },
+          {
+            // Entry valid for ambient temp < 32
+            "key": 32,
+            "floors": [
+              {
+                "group": "power mode",
+                "floors": [
+                  {
+                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
                     "floor": 5000
                   },
                   {
@@ -1050,42 +1086,6 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 8000 },
-                  { "value": 3, "floor": 9000 }
-                ]
-              }
-            ]
-          },
-          {
-            // Entry valid for ambient temp < 32
-            "key": 32,
-            "floors": [
-              {
-                "group": "power mode",
-                "floors": [
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6000
-                  },
-                  {
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 6000
-                  },
-                  {
-                    // OEM == MaximumPerformance
-                    "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 6000
-                  }
-                ]
-              },
-              {
-                "parameter": "pcie_floor_index",
-                "floors": [
-                  { "value": 1, "floor": 8000 },
                   { "value": 2, "floor": 9000 },
                   { "value": 3, "floor": 9500 }
                 ]
@@ -1101,20 +1101,20 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 7000
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 7000
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 7000
+                    "floor": 6000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 7000
+                    "floor": 6000
                   }
                 ]
               },
@@ -1129,8 +1129,8 @@
             ]
           },
           {
-            // Entry valid for ambient temp < 43
-            "key": 43,
+            // Entry valid for ambient temp < 42
+            "key": 42,
             "floors": [
               {
                 "group": "power mode",
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index f900cf7..83c4010 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -938,7 +938,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 57.0,
+         "state": 60.0,
          "delta": 200
        },
        {
@@ -1154,7 +1154,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 54.0,
+         "state": 57.0,
          "delta": 50
        },
        {
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
index bfa148f..2347cbe 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
@@ -126,7 +126,7 @@
       "device_id": "0x1019",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0635",
-      "floor_index": 1
+      "floor_index": 3
     },
     {
       "name": "Cedar Lake 100G 2port",