diff --git a/control/config_files/p10bmc/ibm,everest/events.json b/control/config_files/p10bmc/ibm,everest/events.json
index 93f5fea..97be940 100644
--- a/control/config_files/p10bmc/ibm,everest/events.json
+++ b/control/config_files/p10bmc/ibm,everest/events.json
@@ -86,6 +86,36 @@
          "name": "occ objects",
          "interface": "org.open_power.OCC.Status",
          "property": { "name": "OccActive" }
+       },
+       {
+         "name": "nvme temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "planar temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "flett temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "bear lake temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "ambient temp",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "altitude",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
        }
      ],
      "triggers": [
@@ -118,6 +148,31 @@
                  "name": "occ objects",
                  "interface": "org.open_power.OCC.Status",
                  "property": { "name": "OccActive" }
+               },
+               {
+                 "name": "nvme temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "planar temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "flett temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "bear lake temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "ambient temp",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
                }
              ],
              "target": 10700
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index 0be9635..4c07cab 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -849,6 +849,7 @@
  },
  {
    "name": "nvme temps",
+   "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
@@ -871,6 +872,7 @@
  },
  {
    "name": "bear lake temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_2_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index 0c07a8f..f4f3343 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -86,6 +86,31 @@
          "name": "occ objects",
          "interface": "org.open_power.OCC.Status",
          "property": { "name": "OccActive" }
+       },
+       {
+         "name": "nvme temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "planar temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "flett temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "bear lake temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "ambient temp",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
        }
      ],
      "triggers": [
@@ -118,6 +143,31 @@
                  "name": "occ objects",
                  "interface": "org.open_power.OCC.Status",
                  "property": { "name": "OccActive" }
+               },
+               {
+                 "name": "nvme temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "planar temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "flett temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "bear lake temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "ambient temp",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
                }
              ],
              "target": 10000
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index 791bb10..8df2905 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -263,6 +263,7 @@
  },
  {
    "name": "nvme temps",
+   "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
@@ -299,6 +300,7 @@
  },
  {
    "name": "flett temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
@@ -306,6 +308,7 @@
  },
  {
    "name": "bear lake temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp"
    ]
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/events.json b/control/config_files/p10bmc/ibm,rainier-2u/events.json
index 938bd13..7dca9e0 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/events.json
@@ -96,6 +96,36 @@
          "name": "occ objects",
          "interface": "org.open_power.OCC.Status",
          "property": { "name": "OccActive" }
+       },
+       {
+         "name": "nvme temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "planar temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "flett temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "bear lake temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "ambient temp",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "altitude",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
        }
      ],
      "triggers": [
@@ -128,6 +158,31 @@
                  "name": "occ objects",
                  "interface": "org.open_power.OCC.Status",
                  "property": { "name": "OccActive" }
+               },
+               {
+                 "name": "nvme temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "planar temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "flett temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "bear lake temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "ambient temp",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
                }
              ],
              "target": 17250
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index aa3a6bc..65cb465 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -477,6 +477,7 @@
  },
  {
    "name": "nvme temps",
+   "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
@@ -497,6 +498,7 @@
  },
  {
    "name": "flett temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
@@ -504,6 +506,7 @@
  },
  {
    "name": "bear river temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_2_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index 7626e38..7c0b5e0 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -96,6 +96,31 @@
          "name": "occ objects",
          "interface": "org.open_power.OCC.Status",
          "property": { "name": "OccActive" }
+       },
+       {
+         "name": "nvme temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "planar temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "flett temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "bear lake temps",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
+       },
+       {
+         "name": "ambient temp",
+         "interface": "xyz.openbmc_project.Sensor.Value",
+         "property": { "name": "Value" }
        }
      ],
      "triggers": [
@@ -128,6 +153,31 @@
                  "name": "occ objects",
                  "interface": "org.open_power.OCC.Status",
                  "property": { "name": "OccActive" }
+               },
+               {
+                 "name": "nvme temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "planar temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "flett temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "bear lake temps",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
+               },
+               {
+                 "name": "ambient temp",
+                 "interface": "xyz.openbmc_project.Sensor.Value",
+                 "property": { "name": "Value" }
                }
              ],
              "target": 10000
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index 81ce673..0fdc3b5 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -471,6 +471,7 @@
  },
  {
    "name": "nvme temps",
+   "service": "xyz.openbmc_project.NVMeSensor",
    "members": [
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_1_Temp",
      "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_2_Temp",
@@ -507,6 +508,7 @@
  },
  {
    "name": "flett temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
@@ -514,6 +516,7 @@
  },
  {
    "name": "bear lake temps",
+   "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_2_Temp",