diff --git a/control/config_files/p10bmc/ibm,everest/events.json b/control/config_files/p10bmc/ibm,everest/events.json
index 6130978..5a6346b 100644
--- a/control/config_files/p10bmc/ibm,everest/events.json
+++ b/control/config_files/p10bmc/ibm,everest/events.json
@@ -162,8 +162,8 @@
     ]
   },
   {
-    // Set a raised fan floor when any OCC sensor is nonfunctional
-    "name": "Nonfunctional OCC sensors",
+    // Set a raised fan floor when any temperature sensor is nonfunctional
+    "name": "Nonfunctional temperature sensors",
     "groups": [
       {
         "name": "proc0 core temps",
@@ -274,6 +274,21 @@
         "name": "vdd vrm temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
+      },
+      {
+        "name": "nvme temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "planar temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "bear lake temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
       }
     ],
     "triggers": [
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index e0beec3..e9b5b25 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -162,8 +162,8 @@
     ]
   },
   {
-    // Set a raised fan floor when any OCC sensor is nonfunctional
-    "name": "Nonfunctional OCC sensors",
+    // Set a raised fan floor when any temperature sensor is nonfunctional
+    "name": "Nonfunctional temperature sensors",
     "groups": [
       {
         "name": "proc0 core temps",
@@ -214,6 +214,26 @@
         "name": "vdd vrm temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
+      },
+      {
+        "name": "nvme temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "planar temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "flett temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "bear lake temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
       }
     ],
     "triggers": [
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/events.json b/control/config_files/p10bmc/ibm,rainier-2u/events.json
index f3fe512..54a253c 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/events.json
@@ -172,8 +172,8 @@
     ]
   },
   {
-    // Set a raised fan floor when any OCC sensor is nonfunctional
-    "name": "Nonfunctional OCC sensors",
+    // Set a raised fan floor when any temperature sensor is nonfunctional
+    "name": "Nonfunctional temperature sensors",
     "groups": [
       {
         "name": "proc0 core temps",
@@ -244,6 +244,26 @@
         "name": "vdd vrm temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
+      },
+      {
+        "name": "nvme temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "planar temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "flett temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "bear river temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
       }
     ],
     "triggers": [
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index b8cb39a..febf721 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -172,8 +172,8 @@
     ]
   },
   {
-    // Set a raised fan floor when any OCC sensor is nonfunctional
-    "name": "Nonfunctional OCC sensors",
+    // Set a raised fan floor when any temperature sensor is nonfunctional
+    "name": "Nonfunctional temperature sensors",
     "groups": [
       {
         "name": "proc0 core temps",
@@ -244,6 +244,26 @@
         "name": "vdd vrm temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
+      },
+      {
+        "name": "nvme temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "planar temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "flett temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
+      },
+      {
+        "name": "bear lake temps",
+        "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
+        "property": { "name": "Functional" }
       }
     ],
     "triggers": [