diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 247050b..57c11d5 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -24,7 +24,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -68,7 +68,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -170,7 +170,7 @@
                  "property": { "name": "Value" }
                }
              ],
-             "target": 10000
+             "target": 10400
            }
          ]
        }
@@ -207,7 +207,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -310,7 +310,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -623,7 +623,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 66.0,
+         "state": 63.0,
          "delta": 200
        },
        {
@@ -635,7 +635,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
+         "state": 65.0,
          "delta": 200
        },
        {
@@ -647,7 +647,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 72.0,
+         "state": 74.0,
          "delta": 200
        },
        {
@@ -659,7 +659,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 66.0,
          "delta": 200
        },
        {
@@ -671,7 +671,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 57.0,
          "delta": 200
        },
        {
@@ -744,7 +744,7 @@
            }
          ],
          "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -756,7 +756,7 @@
            }
          ],
          "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -768,7 +768,7 @@
            }
          ],
          "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -780,7 +780,7 @@
            }
          ],
          "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -791,8 +791,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 63.0,
-         "delta": 40
+         "state": 60.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -803,8 +803,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 49.0,
-         "delta": 40
+         "state": 62.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -815,8 +815,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 69.0,
-         "delta": 40
+         "state": 71.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -827,8 +827,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 63.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -839,8 +839,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 54.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -852,7 +852,7 @@
            }
          ],
          "state": 79.0,
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -864,7 +864,7 @@
            }
          ],
          "state": 55.0,
-         "delta": 40
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -876,7 +876,7 @@
            }
          ],
          "state": 60.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -888,7 +888,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -900,7 +900,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        }
      ]
    },
@@ -1046,7 +1046,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 8000 },
+                  { "value": 3, "floor": 9000 }
                 ]
               }
             ]
@@ -1060,20 +1061,20 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 5900
+                    "floor": 6000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 5900
+                    "floor": 6000
                   }
                 ]
               },
@@ -1081,7 +1082,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 8000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 9000 },
+                  { "value": 3, "floor": 9500 }
                 ]
               }
             ]
@@ -1095,28 +1097,29 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 7900
+                    "floor": 7000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 7900
+                    "floor": 7000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9000 },
+                  { "value": 2, "floor": 9500 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]
@@ -1130,28 +1133,29 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 8800
+                    "floor": 8000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9500 },
+                  { "value": 2, "floor": 10400 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
index efe3e65..ce2ca5d 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
@@ -6,7 +6,7 @@
       "device_id": "0xFFFF",
       "subsystem_vendor_id": "0xFFFF",
       "subsystem_id": "0xFFFF",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Flett",
@@ -30,7 +30,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x033B",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "ZR1",
@@ -38,7 +38,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x035E",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Z06",
@@ -46,7 +46,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0355",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Glacier Park EDR 2Port",
@@ -78,7 +78,7 @@
       "device_id": "0x1019",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0617",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Lassen Single Port",
@@ -86,7 +86,7 @@
       "device_id": "0x1017",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0616",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
@@ -94,7 +94,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0621",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
@@ -102,7 +102,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0622",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
@@ -110,7 +110,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0629",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
@@ -118,7 +118,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064A",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
@@ -126,7 +126,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064B",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
@@ -134,7 +134,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064C",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Sentry",
@@ -142,7 +142,7 @@
       "device_id": "0x0466",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0466",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Y4 Crypto",
@@ -150,7 +150,7 @@
       "device_id": "0x037A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x037A",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Haleakala EN 2Port 100Gb",
@@ -166,7 +166,7 @@
       "device_id": "0x04F2",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0005",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Palmita IB 1Port",
@@ -174,7 +174,7 @@
       "device_id": "0x101B",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0672",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Palmita IB 2Port",
@@ -182,7 +182,7 @@
       "device_id": "0x101B",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0673",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Cedar Lake 100G 2port",
@@ -190,7 +190,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A6",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Cedar Lake Crypto 100G 2port",
@@ -198,7 +198,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A5",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Crater Lake 200G 2Port",
@@ -206,7 +206,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A4",
-      "floor_index": 1
+      "floor_index": 3
     },
     {
       "name": "Crater Lake Crypto 200G 2Port",
@@ -214,31 +214,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A3",
-      "floor_index": 1
-    },
-    {
-      "name": "Seahawk2 PM1735 U.2 NVMe SSDs 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0680",
-      "floor_index": 1
-    },
-    {
-      "name": "Seahawk2 PM1735 U.2 NVMe SSDs 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0681",
-      "floor_index": 1
-    },
-    {
-      "name": "Poseidon PM985 U.2 NVMe SSDs 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA808",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0639",
-      "floor_index": 1
+      "floor_index": 3
     },
     {
       "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
@@ -270,6 +246,22 @@
       "device_id": "0x0611",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0611",
+      "floor_index": 3
+    },
+    {
+      "name": "Puntfish",
+      "vendor_id": "0x1077",
+      "device_id": "0x2271",
+      "subsystem_vendor_id": "0x1014",
+      "subsystem_id": "0x069E",
+      "floor_index": 1
+    },
+    {
+      "name": "Bluefish",
+      "vendor_id": "0x10DF",
+      "device_id": "0xE300",
+      "subsystem_vendor_id": "0x1014",
+      "subsystem_id": "0x0614",
       "floor_index": 1
     }
   ]
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json b/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json
index 230bce3..62cd98b 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json
@@ -1,9 +1,9 @@
 [
     {
         "name": "0",
-        "poweron_target": 10000,
-        "default_floor": 9000,
+        "poweron_target": 10400,
+        "default_floor": 10400,
         "increase_delay": 5,
-        "decrease_interval": 30
+        "decrease_interval": 60
     }
 ]
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index b6add91..4b55b4f 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -24,7 +24,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -78,7 +78,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -180,7 +180,7 @@
                  "property": { "name": "Value" }
                }
              ],
-             "target": 10000
+             "target": 10400
            }
          ]
        }
@@ -217,7 +217,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -340,7 +340,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -890,7 +890,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 66.0,
+         "state": 63.0,
          "delta": 200
        },
        {
@@ -902,7 +902,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
+         "state": 65.0,
          "delta": 200
        },
        {
@@ -914,7 +914,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 72.0,
+         "state": 74.0,
          "delta": 200
        },
        {
@@ -926,7 +926,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 66.0,
          "delta": 200
        },
        {
@@ -938,7 +938,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 57.0,
          "delta": 200
        },
        {
@@ -1011,7 +1011,7 @@
            }
          ],
          "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1023,7 +1023,7 @@
            }
          ],
          "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1035,7 +1035,7 @@
            }
          ],
          "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1047,7 +1047,7 @@
            }
          ],
          "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1059,7 +1059,7 @@
            }
          ],
          "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1071,7 +1071,7 @@
            }
          ],
          "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1083,7 +1083,7 @@
            }
          ],
          "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1095,7 +1095,7 @@
            }
          ],
          "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1106,8 +1106,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 63.0,
-         "delta": 40
+         "state": 60.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1118,8 +1118,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 49.0,
-         "delta": 40
+         "state": 62.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1130,8 +1130,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 69.0,
-         "delta": 40
+         "state": 71.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1142,8 +1142,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 63.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1154,8 +1154,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 54.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1167,7 +1167,7 @@
            }
          ],
          "state": 79.0,
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1179,7 +1179,7 @@
            }
          ],
          "state": 55.0,
-         "delta": 40
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1191,7 +1191,7 @@
            }
          ],
          "state": 60.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1203,7 +1203,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1215,7 +1215,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        }
      ]
    },
@@ -1361,7 +1361,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 8000 },
+                  { "value": 3, "floor": 9000 }
                 ]
               }
             ]
@@ -1375,20 +1376,20 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 5900
+                    "floor": 6000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 5900
+                    "floor": 6000
                   }
                 ]
               },
@@ -1396,7 +1397,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 8000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 9000 },
+                  { "value": 3, "floor": 9500 }
                 ]
               }
             ]
@@ -1410,63 +1412,65 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 7900
+                    "floor": 7000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 7900
+                    "floor": 7000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9000 },
+                  { "value": 2, "floor": 9500 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]
           },
           {
-            // Entry valid for ambient temp < 43
-            "key": 43,
+            // Entry valid for ambient temp < 42
+            "key": 42,
             "floors": [
               {
                 "group": "power mode",
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 8800
+                    "floor": 8000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9500 },
+                  { "value": 2, "floor": 10400 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]
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 72a36e4..12b475b 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
@@ -6,7 +6,7 @@
       "device_id": "0xFFFF",
       "subsystem_vendor_id": "0xFFFF",
       "subsystem_id": "0xFFFF",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Flett",
@@ -30,7 +30,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x033B",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "ZR1",
@@ -38,7 +38,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x035E",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Z06",
@@ -46,7 +46,7 @@
       "device_id": "0x034A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0355",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Glacier Park EDR 2Port",
@@ -78,7 +78,7 @@
       "device_id": "0x1019",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0617",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Lassen Single Port",
@@ -86,7 +86,7 @@
       "device_id": "0x1017",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0616",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Everglades 10Gb 2Port",
@@ -110,7 +110,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0621",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
@@ -118,7 +118,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0622",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
@@ -126,7 +126,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0629",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
@@ -134,7 +134,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064A",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
@@ -142,7 +142,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064B",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
@@ -150,7 +150,7 @@
       "device_id": "0xA822",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x064C",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Sentry",
@@ -158,7 +158,7 @@
       "device_id": "0x0466",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0466",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Y4 Crypto",
@@ -166,7 +166,7 @@
       "device_id": "0x037A",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x037A",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Haleakala EN 2Port 100Gb",
@@ -182,7 +182,7 @@
       "device_id": "0x04F2",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0005",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Palmita IB 1Port",
@@ -190,7 +190,7 @@
       "device_id": "0x101B",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0672",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Palmita IB 2Port",
@@ -198,7 +198,7 @@
       "device_id": "0x101B",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0673",
-      "floor_index": 1
+      "floor_index": 2
     },
     {
       "name": "Cedar Lake 100G 2port",
@@ -206,7 +206,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A6",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Cedar Lake Crypto 100G 2port",
@@ -214,7 +214,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A5",
-      "floor_index": 2
+      "floor_index": 3
     },
     {
       "name": "Crater Lake 200G 2Port",
@@ -222,7 +222,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A4",
-      "floor_index": 1
+      "floor_index": 3
     },
     {
       "name": "Crater Lake Crypto 200G 2Port",
@@ -230,31 +230,7 @@
       "device_id": "0x101D",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x06A3",
-      "floor_index": 1
-    },
-    {
-      "name": "Seahawk2 PM1735 U.2 NVMe SSDs 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0680",
-      "floor_index": 1
-    },
-    {
-      "name": "Seahawk2 PM1735 U.2 NVMe SSDs 6.4TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA824",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0681",
-      "floor_index": 1
-    },
-    {
-      "name": "Poseidon PM985 U.2 NVMe SSDs 3.2TB",
-      "vendor_id": "0x144D",
-      "device_id": "0xA808",
-      "subsystem_vendor_id": "0x1014",
-      "subsystem_id": "0x0639",
-      "floor_index": 1
+      "floor_index": 3
     },
     {
       "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
@@ -286,6 +262,22 @@
       "device_id": "0x0611",
       "subsystem_vendor_id": "0x1014",
       "subsystem_id": "0x0611",
+      "floor_index": 3
+    },
+    {
+      "name": "Puntfish",
+      "vendor_id": "0x1077",
+      "device_id": "0x2271",
+      "subsystem_vendor_id": "0x1014",
+      "subsystem_id": "0x069E",
+      "floor_index": 1
+    },
+    {
+      "name": "Bluefish",
+      "vendor_id": "0x10DF",
+      "device_id": "0xE300",
+      "subsystem_vendor_id": "0x1014",
+      "subsystem_id": "0x0614",
       "floor_index": 1
     }
   ]
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/zones.json b/control/config_files/p10bmc/ibm,rainier-4u/zones.json
index 230bce3..62cd98b 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/zones.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/zones.json
@@ -1,9 +1,9 @@
 [
     {
         "name": "0",
-        "poweron_target": 10000,
-        "default_floor": 9000,
+        "poweron_target": 10400,
+        "default_floor": 10400,
         "increase_delay": 5,
-        "decrease_interval": 30
+        "decrease_interval": 60
     }
 ]