diff --git a/src/Appwrite/Platform/Workers/StatsUsage.php b/src/Appwrite/Platform/Workers/StatsUsage.php
index 23cd631df7..b4f54db285 100644
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@@ -190,19 +190,23 @@ class StatsUsage extends Action
                     break;
 
                 case $document->getCollection() === 'functions' || $document->getCollection() === 'sites':
-                    $deployments = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS)));
-                    $deploymentsStorage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE)));
-                    $builds = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS)));
-                    $buildsStorage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE)));
-                    $buildsCompute = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_COMPUTE)));
-                    $executions = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS)));
-                    $executionsCompute = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE)));
+                    $deployments = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS)));
+                    $deploymentsStorage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE)));
+                    $builds = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS)));
+                    $buildsStorage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE)));
+                    $buildsCompute = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_COMPUTE)));
+                    $executions = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS)));
+                    $executionsCompute = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getCollection(), $document->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE)));
 
                     if (!empty($deployments['value'])) {
                         $metrics[] = [
                             'key' => METRIC_DEPLOYMENTS,
                             'value' => ($deployments['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_DEPLOYMENTS),
+                            'value' => ($deployments['value'] * -1),
+                        ];
                     }
 
                     if (!empty($deploymentsStorage['value'])) {
@@ -210,6 +214,10 @@ class StatsUsage extends Action
                             'key' => METRIC_DEPLOYMENTS_STORAGE,
                             'value' => ($deploymentsStorage['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE),
+                            'value' => ($deploymentsStorage['value'] * -1),
+                        ];
                     }
 
                     if (!empty($builds['value'])) {
@@ -217,6 +225,10 @@ class StatsUsage extends Action
                             'key' => METRIC_BUILDS,
                             'value' => ($builds['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_BUILDS),
+                            'value' => ($builds['value'] * -1),
+                        ];
                     }
 
                     if (!empty($buildsStorage['value'])) {
@@ -224,6 +236,10 @@ class StatsUsage extends Action
                             'key' => METRIC_BUILDS_STORAGE,
                             'value' => ($buildsStorage['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_BUILDS_STORAGE),
+                            'value' => ($buildsStorage['value'] * -1),
+                        ];
                     }
 
                     if (!empty($buildsCompute['value'])) {
@@ -231,6 +247,10 @@ class StatsUsage extends Action
                             'key' => METRIC_BUILDS_COMPUTE,
                             'value' => ($buildsCompute['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_BUILDS_COMPUTE),
+                            'value' => ($buildsCompute['value'] * -1),
+                        ];
                     }
 
                     if (!empty($executions['value'])) {
@@ -238,6 +258,10 @@ class StatsUsage extends Action
                             'key' => METRIC_EXECUTIONS,
                             'value' => ($executions['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_EXECUTIONS),
+                            'value' => ($executions['value'] * -1),
+                        ];
                     }
 
                     if (!empty($executionsCompute['value'])) {
@@ -245,6 +269,10 @@ class StatsUsage extends Action
                             'key' => METRIC_EXECUTIONS_COMPUTE,
                             'value' => ($executionsCompute['value'] * -1),
                         ];
+                        $metrics[] = [
+                            'key' => str_replace("{resourceType}", $document->getCollection(), METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE),
+                            'value' => ($executionsCompute['value'] * -1),
+                        ];
                     }
                     break;
                 default: