diff --git a/occ_manager.cpp b/occ_manager.cpp
index 308c67e..7823111 100644
--- a/occ_manager.cpp
+++ b/occ_manager.cpp
@@ -1186,7 +1186,7 @@
         if (existingSensors.find(objectPath) == existingSensors.end())
         {
             dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
-                objectPath);
+                objectPath, {"all_sensors"});
         }
 
         existingSensors[objectPath] = occInstance;
@@ -1290,8 +1290,15 @@
 
         if (existingSensors.find(sensorPath) == existingSensors.end())
         {
+            std::vector<int> occs;
+            std::vector<std::string> fTypeList = {"all_sensors"};
+            if (iter->second == "total_power")
+            {
+                // Total system power has its own chassis association
+                fTypeList.push_back("total_power");
+            }
             dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
-                sensorPath);
+                sensorPath, fTypeList);
         }
 
         existingSensors[sensorPath] = id;