diff --git a/app/init/constants.php b/app/init/constants.php
index 3c8485aa4f..db46303ca8 100644
--- a/app/init/constants.php
+++ b/app/init/constants.php
@@ -90,6 +90,7 @@ const APP_PLATFORM_CLIENT = 'client';
 const APP_PLATFORM_CONSOLE = 'console';
 const APP_VCS_GITHUB_USERNAME = 'Appwrite';
 const APP_VCS_GITHUB_EMAIL = 'team@appwrite.io';
+const APP_VCS_GITHUB_URL = 'https://github.com/TeamAppwrite';
 const APP_BRANDED_EMAIL_BASE_TEMPLATE = 'email-base-styled';
 
 // Database Reconnect
diff --git a/src/Appwrite/Platform/Modules/Compute/Base.php b/src/Appwrite/Platform/Modules/Compute/Base.php
index 92805fbaf8..a538eb1497 100644
--- a/src/Appwrite/Platform/Modules/Compute/Base.php
+++ b/src/Appwrite/Platform/Modules/Compute/Base.php
@@ -5,6 +5,8 @@ namespace Appwrite\Platform\Modules\Compute;
 use Appwrite\Event\Build;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Action;
+use Appwrite\Platform\Modules\Compute\Validator\Specification as SpecificationValidator;
+use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
@@ -19,6 +21,37 @@ use Utopia\VCS\Exception\RepositoryNotFound;
 
 class Base extends Action
 {
+    /**
+     * Get default specification based on plan and available specifications.
+     *
+     * @param array $plan The billing plan configuration
+     * @return string The appropriate default specification
+     */
+    protected function getDefaultSpecification(array $plan): string
+    {
+        $specifications = Config::getParam('specifications', []);
+
+        if (empty($specifications)) {
+            return APP_COMPUTE_SPECIFICATION_DEFAULT;
+        }
+
+        $specificationValidator = new SpecificationValidator(
+            $plan,
+            $specifications,
+            System::getEnv('_APP_COMPUTE_CPUS', 0),
+            System::getEnv('_APP_COMPUTE_MEMORY', 0)
+        );
+        $allowedSpecifications = $specificationValidator->getAllowedSpecifications();
+
+        // If there is no plan use the highest specification
+        if (empty($plan)) {
+            return end($allowedSpecifications) ?? APP_COMPUTE_SPECIFICATION_DEFAULT;
+        }
+
+        // Otherwise, use the lowest specification available in the plan
+        return $allowedSpecifications[0] ?? APP_COMPUTE_SPECIFICATION_DEFAULT;
+    }
+
     public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document
     {
         $deploymentId = ID::unique();
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
index 932f515fc1..ec2a4baac5 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
@@ -93,7 +93,7 @@ class Create extends Base
             ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function.', true)
             ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true)
             ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true)
-            ->param('specification', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new Specification(
+            ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification(
                 $plan,
                 Config::getParam('specifications', []),
                 System::getEnv('_APP_COMPUTE_CPUS', 0),
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
index aaff953af0..318c2a2032 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
@@ -89,7 +89,7 @@ class Update extends Base
             ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true)
             ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true)
             ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true)
-            ->param('specification', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new Specification(
+            ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification(
                 $plan,
                 Config::getParam('specifications', []),
                 System::getEnv('_APP_COMPUTE_CPUS', 0),
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index d6385c1f40..95a9a9fae7 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -467,11 +467,10 @@ class Builds extends Action
                     }
 
                     $providerCommitHash = \trim($stdout);
-                    $authorUrl = "https://github.com/$cloneOwner";
 
                     $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
-                    $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
-                    $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
+                    $deployment->setAttribute('providerCommitAuthorUrl', APP_VCS_GITHUB_URL);
+                    $deployment->setAttribute('providerCommitAuthor', APP_VCS_GITHUB_USERNAME);
                     $deployment->setAttribute('providerCommitMessage', "Create '" . $resource->getAttribute('name', '') . "' function");
                     $deployment->setAttribute('providerCommitUrl', "https://github.com/$cloneOwner/$cloneRepository/commit/$providerCommitHash");
                     $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
index 9be95441cb..a1633b8eba 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
@@ -78,7 +78,7 @@ class Create extends Base
             ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true)
             ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true)
             ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true)
-            ->param('specification', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new Specification(
+            ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification(
                 $plan,
                 Config::getParam('specifications', []),
                 System::getEnv('_APP_COMPUTE_CPUS', 0),
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
index 80354d5067..72ec04a2a5 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
@@ -82,7 +82,7 @@ class Update extends Base
             ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true)
             ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true)
             ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true)
-            ->param('specification', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new Specification(
+            ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification(
                 $plan,
                 Config::getParam('specifications', []),
                 System::getEnv('_APP_COMPUTE_CPUS', 0),
diff --git a/src/Appwrite/Platform/Workers/StatsUsage.php b/src/Appwrite/Platform/Workers/StatsUsage.php
index 32cdb02dea..018c192647 100644
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@@ -435,7 +435,6 @@ class StatsUsage extends Action
                         return $cmp;
                     }
 
-                    unset($this->projects[$sequence]);
                     // Period ASC
                     $cmp = strcmp($a['period'], $b['period']);
                     if ($cmp !== 0) {
diff --git a/tests/unit/Platform/Modules/Compute/Validator/SpecificationTest.php b/tests/unit/Platform/Modules/Compute/Validator/SpecificationTest.php
new file mode 100644
index 0000000000..0505494e17
--- /dev/null
+++ b/tests/unit/Platform/Modules/Compute/Validator/SpecificationTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Unit\Platform\Modules\Compute\Validator;
+
+use Appwrite\Platform\Modules\Compute\Specification as SpecificationConstants;
+use Appwrite\Platform\Modules\Compute\Validator\Specification;
+use PHPUnit\Framework\TestCase;
+use Utopia\Config\Config;
+
+class SpecificationTest extends TestCase
+{
+    private array $specifications;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->specifications = Config::getParam('specifications', []);
+    }
+
+    public function testGetAllowedSpecificationsNoLimits(): void
+    {
+        $validator = new Specification(
+            plan: [],
+            specifications: $this->specifications,
+            maxCpus: 0,
+            maxMemory: 0
+        );
+
+        $allowed = $validator->getAllowedSpecifications();
+        $this->assertCount(count($this->specifications), $allowed);
+        $this->assertEquals(
+            $this->specifications[array_key_last($this->specifications)]['slug'],
+            $allowed[array_key_last($allowed)]
+        );
+    }
+
+    public function testGetAllowedSpecificationsWithMaxCpusAndMemory(): void
+    {
+        $validator = new Specification(
+            plan: [],
+            specifications: $this->specifications,
+            maxCpus: 2,
+            maxMemory: 2048
+        );
+
+        $allowed = $validator->getAllowedSpecifications();
+        $this->assertCount(4, $allowed);
+        $this->assertEquals(
+            SpecificationConstants::S_2VCPU_2GB,
+            $allowed[array_key_last($allowed)]
+        );
+    }
+
+    public function testGetAllowedSpecificationsWithPlanLimits(): void
+    {
+        $plan = [
+            'runtimeSpecifications' => [
+                SpecificationConstants::S_05VCPU_512MB,
+                SpecificationConstants::S_1VCPU_512MB
+            ]
+        ];
+        $validator = new Specification(
+            plan: $plan,
+            specifications: $this->specifications,
+            maxCpus: 0,
+            maxMemory: 0
+        );
+
+        $allowed = $validator->getAllowedSpecifications();
+        $this->assertCount(2, $allowed);
+        $this->assertContains(SpecificationConstants::S_05VCPU_512MB, $allowed);
+        $this->assertContains(SpecificationConstants::S_1VCPU_512MB, $allowed);
+    }
+}