diff --git a/powerstats/ZumaProCommonDataProviders.cpp b/powerstats/ZumaProCommonDataProviders.cpp
index d63b176..4bd3559 100644
--- a/powerstats/ZumaProCommonDataProviders.cpp
+++ b/powerstats/ZumaProCommonDataProviders.cpp
@@ -365,7 +365,7 @@ void addGPU(std::shared_ptr<PowerStats> p) {
         {"890000", 4333}};
 
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
-            EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D", "S8S_VDD_G3D_L2"},
+            EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D"},
             {{UID_TIME_IN_STATE, path + "/uid_time_in_state"}},
             stateCoeffs));
 
@@ -638,12 +638,15 @@ void addTPU(std::shared_ptr<PowerStats> p) {
     stateCoeffs = {
         // TODO (b/197721618): Measuring the TPU power numbers
         {"226000",  10},
-        {"627000",  20},
-        {"845000",  30},
-        {"1066000", 40}};
+        {"455000",  20},
+        {"627000",  30},
+        {"712000",  40},
+        {"845000",  50},
+        {"967000",  60}, // Do not change to 1066000
+        {"1119000", 70}};
 
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
-            EnergyConsumerType::OTHER, "TPU", {"S10M_VDD_TPU"},
+            EnergyConsumerType::OTHER, "TPU", {"S7M_VDD_TPU"},
             {{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}},
             stateCoeffs));
 }