diff --git a/src/Appwrite/Usage/Calculators/Aggregator.php b/src/Appwrite/Usage/Calculators/Aggregator.php
index 6571a22a29..fa50673081 100644
--- a/src/Appwrite/Usage/Calculators/Aggregator.php
+++ b/src/Appwrite/Usage/Calculators/Aggregator.php
@@ -110,19 +110,33 @@ class Aggregator extends Database {
     {
         $this->database->setNamespace('_' . $projectId);
 
-        $this->aggregateDailyMetric($projectId, 'functions.executions');
-        $this->aggregateDailyMetric($projectId, 'functions.builds');
-        $this->aggregateDailyMetric($projectId, 'functions.failures');
-        $this->aggregateMonthlyMetric($projectId, 'functions.executions');
-        $this->aggregateMonthlyMetric($projectId, 'functions.builds');
-        $this->aggregateMonthlyMetric($projectId, 'functions.failures');
+        $functionsGeneralMetrics = [
+            'project.$all.compute.total',
+            'project.$all.compute.time',
+            'executions.$all.compute.total',
+            'executions.$all.compute.success',
+            'executions.$all.compute.failure',
+            'executions.$all.compute.time',
+            'builds.$all.compute.total',
+            'builds.$all.compute.success',
+            'builds.$all.compute.failure',
+            'builds.$all.compute.time',
+        ];
+
+        foreach ($functionsGeneralMetrics as  $metric) {
+            $this->aggregateDailyMetric($projectId, $metric);
+            $this->aggregateMonthlyMetric($projectId, $metric);
+        }
 
         $functionMetrics = [
-            'functions.functionId.executions',
-            'functions.functionId.builds',
-            'functions.functionId.compute',
-            'function.functionId.executions.failure',
-            'function.functionId.builds.failure',
+            'executions.functionId.compute.total',
+            'executions.functionId.compute.success',
+            'executions.functionId.compute.failure',
+            'executions.functionId.compute.time',
+            'builds.functionId.compute.total',
+            'builds.functionId.compute.success',
+            'builds.functionId.compute.failure',
+            'builds.functionId.compute.time',
         ];
 
         $this->foreachDocument($projectId, 'functions', [], function (Document $function) use ($functionMetrics, $projectId) {
diff --git a/src/Appwrite/Usage/Stats.php b/src/Appwrite/Usage/Stats.php
index 68f637d051..4e4ceacfd3 100644
--- a/src/Appwrite/Usage/Stats.php
+++ b/src/Appwrite/Usage/Stats.php
@@ -185,15 +185,15 @@ class Stats
         }
 
         if ($functionExecution >= 1) {
-            $this->statsd->increment('functions.executions.all' . $tags . ',functionId=' . $functionId . ',functionStatus=' . $functionStatus);
-            $this->statsd->count('functions.executions.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
+            $this->statsd->increment('executions.compute' . $tags . ',functionId=' . $functionId . ',functionStatus=' . $functionStatus);
+            $this->statsd->count('executions.compute.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
         }
         if ($functionBuild >= 1) {
-            $this->statsd->increment('functions.builds.all' . $tags . ',functionId=' . $functionId . ',functionBuildStatus=' . $functionBuildStatus);
-            $this->statsd->count('functions.builds.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
+            $this->statsd->increment('builds.compute' . $tags . ',functionId=' . $functionId . ',functionBuildStatus=' . $functionBuildStatus);
+            $this->statsd->count('builds.compute.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
         }
         if ($functionBuild + $functionExecution >= 1) {
-            $this->statsd->count('functions.compute.time' . $tags . ',functionId=' . $functionId, $functionCompute);
+            $this->statsd->count('compute.time' . $tags . ',functionId=' . $functionId, $functionCompute);
         }
 
         $this->reset();