diff --git a/.env b/.env
index a6a3f90e00..722d739d2e 100644
--- a/.env
+++ b/.env
@@ -68,9 +68,12 @@ _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_SITES_SIZE_LIMIT=30000000
+_APP_SITES_TIMEOUT=900
+_APP_SITES_BUILD_TIMEOUT=900
+_APP_SITES_CPUS=8
+_APP_SITES_MEMORY=8192
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
-_APP_SITES_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=8
 _APP_FUNCTIONS_MEMORY=8192
diff --git a/app/config/variables.php b/app/config/variables.php
index 113fbae335..457ccd0f2b 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -714,6 +714,21 @@ return [
             ],
         ],
     ],
+    [
+        'category' => 'Sites',
+        'description' => '',
+        'variables' => [
+            [
+                'name' => '_APP_SITES_SIZE_LIMIT',
+                'description' => 'The maximum size of a site in bytes. The default value is 30MB.',
+                'introduction' => '0.13.0',
+                'default' => '30000000',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ]
+    ],
     [
         'category' => 'Functions',
         'description' => '',
diff --git a/app/controllers/api/console.php b/app/controllers/api/console.php
index eeb823a3d3..a9eb8ac37e 100644
--- a/app/controllers/api/console.php
+++ b/app/controllers/api/console.php
@@ -47,6 +47,7 @@ App::get('/v1/console/variables')
             '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
             '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
             '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
+            '_APP_SITES_SIZE_LIMIT' => +System::getEnv('_APP_SITES_SIZE_LIMIT'),
             '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
             '_APP_VCS_ENABLED' => $isVcsEnabled,
             '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 11a9c3bb2d..ef622d1a68 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -331,8 +331,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
             };
             $entrypoint = match($type) {
                 'function' => $deployment->getAttribute('entrypoint', ''),
-                //todo: check if null works
-                'site' => 'placeholder' // entrypoint is required in api, but not needed with site
+                'site' => ''
             };
             $runtimeEntrypoint = match ($version) {
                 'v2' => '',
@@ -344,7 +343,6 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
                 deploymentId: $deployment->getId(),
                 body: \strlen($body) > 0 ? $body : null,
                 variables: $vars,
-                // todo: figure out timeouts for sites
                 timeout: $resource->getAttribute('timeout', 30),
                 image: $runtime['image'],
                 source: $build->getAttribute('path', ''),
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index ad35135a6f..39a72cd696 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -137,6 +137,12 @@ $image = $this->getParam('image', '');
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
+      _ _APP_SITES_SIZE_LIMIT
+      - _APP_SITES_TIMEOUT
+      - _APP_SITES_BUILD_TIMEOUT
+      - _APP_SITES_CPUS
+      - _APP_SITES_MEMORY
+      - _APP_SITES_FRAMEWORKS
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
diff --git a/docker-compose.yml b/docker-compose.yml
index 9388fb3a7a..bd9c14355c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -462,6 +462,9 @@ services:
       - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_SITES_TIMEOUT
       - _APP_SITES_BUILD_TIMEOUT
+      - _APP_SITES_CPUS
+      - _APP_SITES_MEMORY
+      - _APP_SITES_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
       - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_DOMAIN
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index 4baca4f1bd..0fbdfea8e4 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -115,6 +115,7 @@ class Builds extends Action
      * @param Log $log
      * @return void
      * @throws \Utopia\Database\Exception
+     *
      * @throws Exception
      */
     protected function buildDeployment(Device $deviceForFunctions, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Database $dbForConsole, Database $dbForProject, GitHub $github, Document $project, Document $resource, Document $deployment, Document $template, Log $log): void
@@ -393,9 +394,13 @@ class Builds extends Action
                 }
 
                 $directorySize = $localDevice->getDirectorySize($tmpDirectory);
-                $functionsSizeLimit = (int)System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', '30000000');
-                if ($directorySize > $functionsSizeLimit) {
-                    throw new \Exception('Repository directory size should be less than ' . number_format($functionsSizeLimit / 1048576, 2) . ' MBs.');
+                $sizeLimit = match ($resource->getCollection()) {
+                    'functions' => (int)System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', '30000000'),
+                    'sites' => (int)System::getEnv('_APP_SITES_SIZE_LIMIT', '50000000')
+                };
+
+                if ($directorySize > $sizeLimit) {
+                    throw new \Exception('Repository directory size should be less than ' . number_format($sizeLimit / 1048576, 2) . ' MBs.');
                 }
 
                 $tarParamDirectory = '/tmp/builds/' . $buildId . '/code' . (empty($rootDirectory) ? '' : '/' . $rootDirectory);
@@ -473,16 +478,37 @@ class Builds extends Action
                 $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
             }
 
-            $cpus = $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT;
-            $memory = max($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT, 1024); // We have a minimum of 1024MB here because some runtimes can't compile with less memory than this.
+            $collection = $resource->getCollection();
 
-            $jwtExpiry = (int)System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
-            $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-            //todo: not needed for sites yet, might be useful as a build variable but too shortlived
-            $apiKey = $jwtObj->encode([
-                'projectId' => $project->getId(),
-                'scopes' => $resource->getAttribute('scopes', [])
-            ]);
+            $cpus = match ($collection) {
+                'functions' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+                'sites' => $siteVars['cpus'] ?? APP_SITE_CPUS_DEFAULT,
+                default => APP_FUNCTION_CPUS_DEFAULT,
+            };
+
+            $memory = match ($collection) {
+                'functions' => max($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT, 1024),
+                'sites' => max($siteVars['memory'] ?? APP_SITE_MEMORY_DEFAULT, 1024),
+                default => max(APP_FUNCTION_MEMORY_DEFAULT, 1024), // We have a minimum of 1024MB here because some runtimes can't compile with less memory than this.
+            };
+
+            $timeout = match ($collection) {
+                'functions' => (int) System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900),
+                'sites' => (int) System::getEnv('_APP_SITES_BUILD_TIMEOUT', 900),
+            };
+
+            // JWT and API key generation for functions only
+            if ($collection === 'functions') {
+                $jwtExpiry = (int)System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
+                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+
+                $apiKey = $jwtObj->encode([
+                    'projectId' => $project->getId(),
+                    'scopes' => $resource->getAttribute('scopes', [])
+                ]);
+
+                $vars = array_merge($vars, ['APPWRITE_FUNCTION_API_KEY' => API_KEY_DYNAMIC . '_' . $apiKey]);
+            }
 
             $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
             $hostname = System::getEnv('_APP_DOMAIN');
@@ -512,7 +538,6 @@ class Builds extends Action
                     $vars = [
                         ...$vars,
                         'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-                        'APPWRITE_FUNCTION_API_KEY' => API_KEY_DYNAMIC . '_' . $apiKey,
                         'APPWRITE_FUNCTION_ID' => $resource->getId(),
                         'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
                         'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
@@ -554,7 +579,7 @@ class Builds extends Action
             $isCanceled = false;
 
             Co::join([
-                Co\go(function () use ($executor, &$response, $project, $deployment, $source, $resource, $runtime, $vars, $command, $cpus, $memory, &$err, $version) {
+                Co\go(function () use ($executor, &$response, $project, $deployment, $source, $resource, $runtime, $vars, $command, $cpus, $memory, $timeout, &$err, $version) {
                     try {
                         $command = $version === 'v2' ? 'tar -zxf /tmp/code.tar.gz -C /usr/code && cd /usr/local/src/ && ./build.sh' : 'tar -zxf /tmp/code.tar.gz -C /mnt/code && helpers/build.sh "' . \trim(\escapeshellarg($command), "\'") . '"';
 
@@ -566,6 +591,7 @@ class Builds extends Action
                             version: $version,
                             cpus: $cpus,
                             memory: $memory,
+                            timeout: $timeout,
                             remove: true,
                             entrypoint: $deployment->getAttribute('entrypoint', 'package.json'), // TODO: change this later so that sites don't need to have an entrypoint
                             destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
diff --git a/src/Appwrite/Platform/Services/Workers.php b/src/Appwrite/Platform/Services/Workers.php
index 0e79f4257c..bdbb99be75 100644
--- a/src/Appwrite/Platform/Services/Workers.php
+++ b/src/Appwrite/Platform/Services/Workers.php
@@ -3,7 +3,6 @@
 namespace Appwrite\Platform\Services;
 
 use Appwrite\Platform\Workers\Audits;
-use Appwrite\Platform\Workers\Builds;
 use Appwrite\Platform\Workers\Certificates;
 use Appwrite\Platform\Workers\Databases;
 use Appwrite\Platform\Workers\Deletes;
@@ -23,7 +22,6 @@ class Workers extends Service
         $this->type = Service::TYPE_WORKER;
         $this
             ->addAction(Audits::getName(), new Audits())
-            ->addAction(Builds::getName(), new Builds())
             ->addAction(Certificates::getName(), new Certificates())
             ->addAction(Databases::getName(), new Databases())
             ->addAction(Deletes::getName(), new Deletes())
diff --git a/src/Appwrite/Platform/Workers/Builds.php b/src/Appwrite/Platform/Workers/Builds.php
deleted file mode 100644
index 538423a95d..0000000000
--- a/src/Appwrite/Platform/Workers/Builds.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Workers;
-
-use Ahc\Jwt\JWT;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\Usage;
-use Appwrite\Messaging\Adapter\Realtime;
-use Appwrite\Utopia\Response\Model\Deployment;
-use Appwrite\Vcs\Comment;
-use Exception;
-use Executor\Executor;
-use Swoole\Coroutine as Co;
-use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Conflict;
-use Utopia\Database\Exception\Restricted;
-use Utopia\Database\Exception\Structure;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Logger\Log;
-use Utopia\Platform\Action;
-use Utopia\Queue\Message;
-use Utopia\Storage\Device;
-use Utopia\Storage\Device\Local;
-use Utopia\System\System;
-use Utopia\VCS\Adapter\Git\GitHub;
-
-class Builds extends Action
-{
-    public static function getName(): string
-    {
-        return 'builds';
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function __construct()
-    {
-        $this
-            ->desc('Builds worker')
-            ->inject('message')
-            ->inject('dbForConsole')
-            ->inject('queueForEvents')
-            ->inject('queueForFunctions')
-            ->inject('queueForUsage')
-            ->inject('cache')
-            ->inject('dbForProject')
-            ->inject('deviceForFunctions')
-            ->inject('log')
-            ->callback(fn ($message, Database $dbForConsole, Event $queueForEvents, Func $queueForFunctions, Usage $usage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, Log $log) => $this->action($message, $dbForConsole, $queueForEvents, $queueForFunctions, $usage, $cache, $dbForProject, $deviceForFunctions, $log));
-    }
-
-    /**
-     * @param Message $message
-     * @param Database $dbForConsole
-     * @param Event $queueForEvents
-     * @param Func $queueForFunctions
-     * @param Usage $queueForUsage
-     * @param Cache $cache
-     * @param Database $dbForProject
-     * @param Device $deviceForFunctions
-     * @param Log $log
-     * @return void
-     * @throws \Utopia\Database\Exception
-     */
-    public function action(Message $message, Database $dbForConsole, Event $queueForEvents, Func $queueForFunctions, Usage $queueForUsage, Cache $cache, Database $dbForProject, Device $deviceForFunctions, Log $log): void
-    {
-        $payload = $message->getPayload() ?? [];
-
-        if (empty($payload)) {
-            throw new \Exception('Missing payload');
-        }
-
-        $type = $payload['type'] ?? '';
-        $project = new Document($payload['project'] ?? []);
-        $resource = new Document($payload['resource'] ?? []);
-        $deployment = new Document($payload['deployment'] ?? []);
-        $template = new Document($payload['template'] ?? []);
-
-        $log->addTag('projectId', $project->getId());
-        $log->addTag('type', $type);
-
-        switch ($type) {
-            case BUILD_TYPE_DEPLOYMENT:
-            case BUILD_TYPE_RETRY:
-                Console::info('Creating build for deployment: ' . $deployment->getId());
-                $github = new GitHub($cache);
-                $this->buildDeployment($deviceForFunctions, $queueForFunctions, $queueForEvents, $queueForUsage, $dbForConsole, $dbForProject, $github, $project, $resource, $deployment, $template, $log);
-                break;
-
-            default:
-                throw new \Exception('Invalid build type');
-        }
-    }
-
-    /**
-     * @param Device $deviceForFunctions
-     * @param Func $queueForFunctions
-     * @param Event $queueForEvents
-     * @param Usage $queueForUsage
-     * @param Database $dbForConsole
-     * @param Database $dbForProject
-     * @param GitHub $github
-     * @param Document $project
-     * @param Document $resource
-     * @param Document $deployment
-     * @param Document $template
-     * @param Log $log
-     * @return void
-     * @throws \Utopia\Database\Exception
-     * @throws Exception
-     */
-    protected function buildDeployment(Device $deviceForFunctions, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Database $dbForConsole, Database $dbForProject, GitHub $github, Document $project, Document $resource, Document $deployment, Document $template, Log $log): void
-    {
-        // todo: refactor
-        $isFunction = $resource->getCollection() === 'functions';
-        $isSite = $resource->getCollection() === 'sites';
-        $foreignKey = $isFunction ? 'functionId' : 'siteId';
-
-        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
-
-        $log->addTag($foreignKey, $resource->getId());
-
-        $resource = $dbForProject->getDocument($resource->getCollection(), $resource->getId());
-        if ($resource->isEmpty()) {
-            throw new \Exception('Function not found', 404);
-        }
-
-        $log->addTag('deploymentId', $deployment->getId());
-
-        $deployment = $dbForProject->getDocument('deployments', $deployment->getId());
-        if ($deployment->isEmpty()) {
-            throw new \Exception('Deployment not found', 404);
-        }
-
-        if (empty($deployment->getAttribute('entrypoint', ''))) {
-            throw new \Exception('Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".', 500);
-        }
-
-        $version = $resource->getAttribute('version', 'v2');
-        $spec = Config::getParam('runtime-specifications')[$resource->getAttribute('specifications', APP_FUNCTION_SPECIFICATION_DEFAULT)];
-        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        // todo: fix for sites using frameworks
-        $key =  $resource->getAttribute('runtime');
-        $runtime = $runtimes[$key] ?? null;
-        if (\is_null($runtime)) {
-            throw new \Exception('Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
-        }
-
-        // Realtime preparation
-        $allEvents = Event::generateEvents("{$resource->getCollection()}.[{$foreignKey}].deployments.[deploymentId].update", [
-            $foreignKey => $resource->getId(),
-            'deploymentId' => $deployment->getId()
-        ]);
-
-        $startTime = DateTime::now();
-        $durationStart = \microtime(true);
-        $buildId = $deployment->getAttribute('buildId', '');
-        $build = $dbForProject->getDocument('builds', $buildId);
-        $isNewBuild = empty($buildId);
-        if ($build->isEmpty()) {
-            $buildId = ID::unique();
-            $build = $dbForProject->createDocument('builds', new Document([
-                '$id' => $buildId,
-                '$permissions' => [],
-                'startTime' => $startTime,
-                'deploymentInternalId' => $deployment->getInternalId(),
-                'deploymentId' => $deployment->getId(),
-                'status' => 'processing',
-                'path' => '',
-                'runtime' => $resource->getAttribute('runtime'),
-                'source' => $deployment->getAttribute('path', ''),
-                'sourceType' => strtolower($deviceForFunctions->getType()),
-                'logs' => '',
-                'endTime' => null,
-                'duration' => 0,
-                'size' => 0
-            ]));
-
-            $deployment->setAttribute('buildId', $build->getId());
-            $deployment->setAttribute('buildInternalId', $build->getInternalId());
-            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
-        } elseif ($build->getAttribute('status') === 'canceled') {
-            Console::info('Build has been canceled');
-            return;
-        } else {
-            $build = $dbForProject->getDocument('builds', $buildId);
-        }
-
-        $source = $deployment->getAttribute('path', '');
-        $installationId = $deployment->getAttribute('installationId', '');
-        $providerRepositoryId = $deployment->getAttribute('providerRepositoryId', '');
-        $providerCommitHash = $deployment->getAttribute('providerCommitHash', '');
-        $isVcsEnabled = !empty($providerRepositoryId);
-        $owner = '';
-        $repositoryName = '';
-
-        if ($isVcsEnabled) {
-            $installation = $dbForConsole->getDocument('installations', $installationId);
-            $providerInstallationId = $installation->getAttribute('providerInstallationId');
-            $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
-            $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
-
-            $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
-        }
-
-        try {
-            if ($isNewBuild && !$isVcsEnabled) {
-                // Non-vcs+Template
-
-                $templateRepositoryName = $template->getAttribute('repositoryName', '');
-                $templateOwnerName = $template->getAttribute('ownerName', '');
-                $templateVersion = $template->getAttribute('version', '');
-
-                $templateRootDirectory = $template->getAttribute('rootDirectory', '');
-                $templateRootDirectory = \rtrim($templateRootDirectory, '/');
-                $templateRootDirectory = \ltrim($templateRootDirectory, '.');
-                $templateRootDirectory = \ltrim($templateRootDirectory, '/');
-
-                if (!empty($templateRepositoryName) && !empty($templateOwnerName) && !empty($templateVersion)) {
-                    $stdout = '';
-                    $stderr = '';
-
-                    // Clone template repo
-                    $tmpTemplateDirectory = '/tmp/builds/' . $buildId . '-template';
-                    $gitCloneCommandForTemplate = $github->generateCloneCommand($templateOwnerName, $templateRepositoryName, $templateVersion, GitHub::CLONE_TYPE_TAG, $tmpTemplateDirectory, $templateRootDirectory);
-                    $exit = Console::execute($gitCloneCommandForTemplate, '', $stdout, $stderr);
-
-                    if ($exit !== 0) {
-                        throw new \Exception('Unable to clone code repository: ' . $stderr);
-                    }
-
-                    // Ensure directories
-                    Console::execute('mkdir -p ' . \escapeshellarg($tmpTemplateDirectory . '/' . $templateRootDirectory), '', $stdout, $stderr);
-
-                    $tmpPathFile = $tmpTemplateDirectory . '/code.tar.gz';
-
-                    $localDevice = new Local();
-
-                    if (substr($tmpTemplateDirectory, -1) !== '/') {
-                        $tmpTemplateDirectory .= '/';
-                    }
-
-                    $tarParamDirectory = \escapeshellarg($tmpTemplateDirectory . (empty($templateRootDirectory) ? '' : '/' . $templateRootDirectory));
-                    Console::execute('tar --exclude code.tar.gz -czf ' . \escapeshellarg($tmpPathFile) . ' -C ' . \escapeshellcmd($tarParamDirectory) . ' .', '', $stdout, $stderr); // TODO: Replace escapeshellcmd with escapeshellarg if we find a way that doesnt break syntax
-
-                    $source = $deviceForFunctions->getPath($deployment->getId() . '.' . \pathinfo('code.tar.gz', PATHINFO_EXTENSION));
-                    $result = $localDevice->transfer($tmpPathFile, $source, $deviceForFunctions);
-
-                    if (!$result) {
-                        throw new \Exception("Unable to move file");
-                    }
-
-                    Console::execute('rm -rf ' . \escapeshellarg($tmpTemplateDirectory), '', $stdout, $stderr);
-
-                    $directorySize = $deviceForFunctions->getFileSize($source);
-                    $build = $dbForProject->updateDocument('builds', $build->getId(), $build->setAttribute('source', $source));
-                    $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment->setAttribute('path', $source)->setAttribute('size', $directorySize));
-                }
-            } elseif ($isNewBuild && $isVcsEnabled) {
-                // VCS and VCS+Temaplte
-                $tmpDirectory = '/tmp/builds/' . $buildId . '/code';
-                $rootDirectory = $resource->getAttribute('providerRootDirectory', '');
-                $rootDirectory = \rtrim($rootDirectory, '/');
-                $rootDirectory = \ltrim($rootDirectory, '.');
-                $rootDirectory = \ltrim($rootDirectory, '/');
-
-                $owner = $github->getOwnerName($providerInstallationId);
-                $repositoryName = $github->getRepositoryName($providerRepositoryId);
-
-                $cloneOwner = $deployment->getAttribute('providerRepositoryOwner', $owner);
-                $cloneRepository = $deployment->getAttribute('providerRepositoryName', $repositoryName);
-
-                $branchName = $deployment->getAttribute('providerBranch');
-                $commitHash = $deployment->getAttribute('providerCommitHash', '');
-
-                $cloneVersion = $branchName;
-                $cloneType = GitHub::CLONE_TYPE_BRANCH;
-                if (!empty($commitHash)) {
-                    $cloneVersion = $commitHash;
-                    $cloneType = GitHub::CLONE_TYPE_COMMIT;
-                }
-
-                $gitCloneCommand = $github->generateCloneCommand($cloneOwner, $cloneRepository, $cloneVersion, $cloneType, $tmpDirectory, $rootDirectory);
-                $stdout = '';
-                $stderr = '';
-
-                Console::execute('mkdir -p ' . \escapeshellarg('/tmp/builds/' . $buildId), '', $stdout, $stderr);
-
-                if ($dbForProject->getDocument('builds', $buildId)->getAttribute('status') === 'canceled') {
-                    Console::info('Build has been canceled');
-                    return;
-                }
-
-                $exit = Console::execute($gitCloneCommand, '', $stdout, $stderr);
-
-                if ($exit !== 0) {
-                    throw new \Exception('Unable to clone code repository: ' . $stderr);
-                }
-
-                // Local refactoring for function folder with spaces
-                if (str_contains($rootDirectory, ' ')) {
-                    $rootDirectoryWithoutSpaces = str_replace(' ', '', $rootDirectory);
-                    $from = $tmpDirectory . '/' . $rootDirectory;
-                    $to = $tmpDirectory . '/' . $rootDirectoryWithoutSpaces;
-                    $exit = Console::execute('mv "' . \escapeshellarg($from) . '" "' . \escapeshellarg($to) . '"', '', $stdout, $stderr);
-
-                    if ($exit !== 0) {
-                        throw new \Exception('Unable to move function with spaces' . $stderr);
-                    }
-                    $rootDirectory = $rootDirectoryWithoutSpaces;
-                }
-
-
-                // Build from template
-                $templateRepositoryName = $template->getAttribute('repositoryName', '');
-                $templateOwnerName = $template->getAttribute('ownerName', '');
-                $templateVersion = $template->getAttribute('version', '');
-
-                $templateRootDirectory = $template->getAttribute('rootDirectory', '');
-                $templateRootDirectory = \rtrim($templateRootDirectory, '/');
-                $templateRootDirectory = \ltrim($templateRootDirectory, '.');
-                $templateRootDirectory = \ltrim($templateRootDirectory, '/');
-
-                if (!empty($templateRepositoryName) && !empty($templateOwnerName) && !empty($templateVersion)) {
-                    // Clone template repo
-                    $tmpTemplateDirectory = '/tmp/builds/' . $buildId . '/template';
-
-                    $gitCloneCommandForTemplate = $github->generateCloneCommand($templateOwnerName, $templateRepositoryName, $templateVersion, GitHub::CLONE_TYPE_TAG, $tmpTemplateDirectory, $templateRootDirectory);
-                    $exit = Console::execute($gitCloneCommandForTemplate, '', $stdout, $stderr);
-
-                    if ($exit !== 0) {
-                        throw new \Exception('Unable to clone code repository: ' . $stderr);
-                    }
-
-                    // Ensure directories
-                    Console::execute('mkdir -p ' . \escapeshellarg($tmpTemplateDirectory . '/' . $templateRootDirectory), '', $stdout, $stderr);
-                    Console::execute('mkdir -p ' . \escapeshellarg($tmpDirectory . '/' . $rootDirectory), '', $stdout, $stderr);
-
-                    // Merge template into user repo
-                    Console::execute('rsync -av --exclude \'.git\' ' . \escapeshellarg($tmpTemplateDirectory . '/' . $templateRootDirectory . '/') . ' ' . \escapeshellarg($tmpDirectory . '/' . $rootDirectory), '', $stdout, $stderr);
-
-                    // Commit and push
-                    $exit = Console::execute('git config --global user.email "team@appwrite.io" && git config --global user.name "Appwrite" && cd ' . \escapeshellarg($tmpDirectory) . ' && git add . && git commit -m "Create ' . \escapeshellarg($resource->getAttribute('name', '')) . ' function" && git push origin ' . \escapeshellarg($branchName), '', $stdout, $stderr);
-
-                    if ($exit !== 0) {
-                        throw new \Exception('Unable to push code repository: ' . $stderr);
-                    }
-
-                    $exit = Console::execute('cd ' . \escapeshellarg($tmpDirectory) . ' && git rev-parse HEAD', '', $stdout, $stderr);
-
-                    if ($exit !== 0) {
-                        throw new \Exception('Unable to get vcs commit SHA: ' . $stderr);
-                    }
-
-                    $providerCommitHash = \trim($stdout);
-                    $authorUrl = "https://github.com/$cloneOwner";
-
-                    $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
-                    $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
-                    $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
-                    $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);
-
-                    /**
-                     * Send realtime Event
-                     */
-                    $target = Realtime::fromPayload(
-                        // Pass first, most verbose event pattern
-                        event: $allEvents[0],
-                        payload: $build,
-                        project: $project
-                    );
-                    Realtime::send(
-                        projectId: 'console',
-                        payload: $build->getArrayCopy(),
-                        events: $allEvents,
-                        channels: $target['channels'],
-                        roles: $target['roles']
-                    );
-                }
-
-                $tmpPath = '/tmp/builds/' . $buildId;
-                $tmpPathFile = $tmpPath . '/code.tar.gz';
-                $localDevice = new Local();
-
-                if (substr($tmpDirectory, -1) !== '/') {
-                    $tmpDirectory .= '/';
-                }
-
-                $directorySize = $localDevice->getDirectorySize($tmpDirectory);
-                $functionsSizeLimit = (int)System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', '30000000');
-                if ($directorySize > $functionsSizeLimit) {
-                    throw new \Exception('Repository directory size should be less than ' . number_format($functionsSizeLimit / 1048576, 2) . ' MBs.');
-                }
-
-                $tarParamDirectory = '/tmp/builds/' . $buildId . '/code' . (empty($rootDirectory) ? '' : '/' . $rootDirectory);
-                Console::execute('tar --exclude code.tar.gz -czf ' . \escapeshellarg($tmpPathFile) . ' -C ' . \escapeshellcmd($tarParamDirectory) . ' .', '', $stdout, $stderr); // TODO: Replace escapeshellcmd with escapeshellarg if we find a way that doesnt break syntax
-
-                $source = $deviceForFunctions->getPath($deployment->getId() . '.' . \pathinfo('code.tar.gz', PATHINFO_EXTENSION));
-                $result = $localDevice->transfer($tmpPathFile, $source, $deviceForFunctions);
-
-                if (!$result) {
-                    throw new \Exception("Unable to move file");
-                }
-
-                Console::execute('rm -rf ' . \escapeshellarg($tmpPath), '', $stdout, $stderr);
-
-                $build = $dbForProject->updateDocument('builds', $build->getId(), $build->setAttribute('source', $source));
-
-                $directorySize = $deviceForFunctions->getFileSize($source);
-                $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment->setAttribute('path', $source)->setAttribute('size', $directorySize));
-
-                $this->runGitAction('processing', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForConsole);
-            }
-
-            /** Request the executor to build the code... */
-            $build->setAttribute('status', 'building');
-            $build = $dbForProject->updateDocument('builds', $buildId, $build);
-
-            if ($isVcsEnabled) {
-                $this->runGitAction('building', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForConsole);
-            }
-
-            /** Trigger Webhook */
-            $deploymentModel = new Deployment();
-            $deploymentUpdate =
-                $queueForEvents
-                    ->setQueue(Event::WEBHOOK_QUEUE_NAME)
-                    ->setClass(Event::WEBHOOK_CLASS_NAME)
-                    ->setProject($project)
-                    ->setEvent("{$resource->getCollection()}.[{$foreignKey}].deployments.[deploymentId].update")
-                    ->setParam($foreignKey, $resource->getId())
-                    ->setParam('deploymentId', $deployment->getId())
-                    ->setPayload($deployment->getArrayCopy(array_keys($deploymentModel->getRules())));
-
-            $deploymentUpdate->trigger();
-
-            /** Trigger Functions */
-            $queueForFunctions
-                ->from($deploymentUpdate)
-                ->trigger();
-
-            /** Trigger Realtime */
-            $target = Realtime::fromPayload(
-                // Pass first, most verbose event pattern
-                event: $allEvents[0],
-                payload: $build,
-                project: $project
-            );
-
-            Realtime::send(
-                projectId: 'console',
-                payload: $build->getArrayCopy(),
-                events: $allEvents,
-                channels: $target['channels'],
-                roles: $target['roles']
-            );
-
-            $vars = [];
-
-            // Shared vars
-            foreach ($resource->getAttribute('varsProject', []) as $var) {
-                $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
-            }
-
-            // Function vars
-            foreach ($resource->getAttribute('vars', []) as $var) {
-                $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
-            }
-
-            $cpus = $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT;
-            $memory = max($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT, 1024); // We have a minimum of 1024MB here because some runtimes can't compile with less memory than this.
-
-            $jwtExpiry = (int)System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
-            $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-            //todo: not needed for sites yet, might be useful as a build variable but too shortlived
-            $apiKey = $jwtObj->encode([
-                'projectId' => $project->getId(),
-                'scopes' => $resource->getAttribute('scopes', [])
-            ]);
-
-            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $hostname = System::getEnv('_APP_DOMAIN');
-            $endpoint = $protocol . '://' . $hostname . "/v1";
-
-            //todo: ugly, but works
-            if ($isFunction) {
-                $vars = [
-                    ...$vars,
-                    'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-                    'APPWRITE_FUNCTION_API_KEY' => API_KEY_DYNAMIC . '_' . $apiKey,
-                    'APPWRITE_FUNCTION_ID' => $resource->getId(),
-                    'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
-                    'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
-                    'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
-                    'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
-                    'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-                    'APPWRITE_FUNCTION_CPUS' => $cpus,
-                    'APPWRITE_FUNCTION_MEMORY' => $memory
-                ];
-            }
-            if ($isSite) {
-                $vars = [
-                    ...$vars,
-                    'APPWRITE_SITE_ID' => $resource->getId(),
-                    'APPWRITE_SITE_NAME' => $resource->getAttribute('name'),
-                    'APPWRITE_SITE_DEPLOYMENT' => $deployment->getId(),
-                    'APPWRITE_SITE_PROJECT_ID' => $project->getId(),
-                    'APPWRITE_SITE_RUNTIME_NAME' => $runtime['name'] ?? '',
-                    'APPWRITE_SITE_RUNTIME_VERSION' => $runtime['version'] ?? '',
-                    'APPWRITE_SITE_CPUS' => $cpus,
-                    'APPWRITE_SITE_MEMORY' => $memory
-                ];
-            }
-
-            // Appwrite vars
-            $vars = \array_merge($vars, [
-                'APPWRITE_VERSION' => APP_VERSION_STABLE,
-                'APPWRITE_REGION' => $project->getAttribute('region'),
-                'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
-                'APPWRITE_VCS_REPOSITORY_ID' => $deployment->getAttribute('providerRepositoryId', ''),
-                'APPWRITE_VCS_REPOSITORY_NAME' => $deployment->getAttribute('providerRepositoryName', ''),
-                'APPWRITE_VCS_REPOSITORY_OWNER' => $deployment->getAttribute('providerRepositoryOwner', ''),
-                'APPWRITE_VCS_REPOSITORY_URL' => $deployment->getAttribute('providerRepositoryUrl', ''),
-                'APPWRITE_VCS_REPOSITORY_BRANCH' => $deployment->getAttribute('providerBranch', ''),
-                'APPWRITE_VCS_REPOSITORY_BRANCH_URL' => $deployment->getAttribute('providerBranchUrl', ''),
-                'APPWRITE_VCS_COMMIT_HASH' => $deployment->getAttribute('providerCommitHash', ''),
-                'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
-                'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
-                'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
-                'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
-                'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
-            ]);
-
-            //todo: for sites use isntall and build command
-            $command = $deployment->getAttribute('commands', '');
-
-            $response = null;
-            $err = null;
-
-            if ($dbForProject->getDocument('builds', $buildId)->getAttribute('status') === 'canceled') {
-                Console::info('Build has been canceled');
-                return;
-            }
-
-            $isCanceled = false;
-
-            Co::join([
-                Co\go(function () use ($executor, &$response, $project, $deployment, $source, $resource, $runtime, $vars, $command, $cpus, $memory, &$err) {
-                    try {
-                        $version = $resource->getAttribute('version', 'v2');
-                        $command = $version === 'v2' ? 'tar -zxf /tmp/code.tar.gz -C /usr/code && cd /usr/local/src/ && ./build.sh' : 'tar -zxf /tmp/code.tar.gz -C /mnt/code && helpers/build.sh "' . \trim(\escapeshellarg($command), "\'") . '"';
-
-                        $response = $executor->createRuntime(
-                            deploymentId: $deployment->getId(),
-                            projectId: $project->getId(),
-                            source: $source,
-                            image: $runtime['image'],
-                            version: $version,
-                            cpus: $cpus,
-                            memory: $memory,
-                            remove: true,
-                            entrypoint: $deployment->getAttribute('entrypoint'),
-                            destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
-                            variables: $vars,
-                            command: $command
-                        );
-                    } catch (\Throwable $error) {
-                        $err = $error;
-                    }
-                }),
-                Co\go(function () use ($executor, $project, $deployment, &$response, &$build, $dbForProject, $allEvents, &$err, &$isCanceled) {
-                    try {
-                        $executor->getLogs(
-                            deploymentId: $deployment->getId(),
-                            projectId: $project->getId(),
-                            callback: function ($logs) use (&$response, &$err, &$build, $dbForProject, $allEvents, $project, &$isCanceled) {
-                                if ($isCanceled) {
-                                    return;
-                                }
-
-                                // If we have response or error from concurrent coroutine, we already have latest logs
-                                if ($response === null && $err === null) {
-                                    $build = $dbForProject->getDocument('builds', $build->getId());
-
-                                    if ($build->isEmpty()) {
-                                        throw new \Exception('Build not found', 404);
-                                    }
-
-                                    if ($build->getAttribute('status') === 'canceled') {
-                                        $isCanceled = true;
-                                        Console::info('Ignoring realtime logs because build has been canceled');
-                                        return;
-                                    }
-
-                                    $logs = \mb_substr($logs, 0, null, 'UTF-8'); // Get only valid UTF8 part - removes leftover half-multibytes causing SQL errors
-
-                                    $build = $build->setAttribute('logs', $build->getAttribute('logs', '') . $logs);
-                                    $build = $dbForProject->updateDocument('builds', $build->getId(), $build);
-
-                                    /**
-                                     * Send realtime Event
-                                     */
-                                    $target = Realtime::fromPayload(
-                                        // Pass first, most verbose event pattern
-                                        event: $allEvents[0],
-                                        payload: $build,
-                                        project: $project
-                                    );
-                                    Realtime::send(
-                                        projectId: 'console',
-                                        payload: $build->getArrayCopy(),
-                                        events: $allEvents,
-                                        channels: $target['channels'],
-                                        roles: $target['roles']
-                                    );
-                                }
-                            }
-                        );
-                    } catch (\Throwable $error) {
-                        if (empty($err)) {
-                            $err = $error;
-                        }
-                    }
-                }),
-            ]);
-
-            if ($dbForProject->getDocument('builds', $buildId)->getAttribute('status') === 'canceled') {
-                Console::info('Build has been canceled');
-                return;
-            }
-
-            if ($err) {
-                throw $err;
-            }
-
-            $endTime = DateTime::now();
-            $durationEnd = \microtime(true);
-
-            $buildSizeLimit = (int)System::getEnv('_APP_FUNCTIONS_BUILD_SIZE_LIMIT', '2000000000');
-            if ($response['size'] > $buildSizeLimit) {
-                throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / 1048576, 2) . ' MBs.');
-            }
-
-            /** Update the build document */
-            $build->setAttribute('startTime', DateTime::format((new \DateTime())->setTimestamp(floor($response['startTime']))));
-            $build->setAttribute('endTime', $endTime);
-            $build->setAttribute('duration', \intval(\ceil($durationEnd - $durationStart)));
-            $build->setAttribute('status', 'ready');
-            $build->setAttribute('path', $response['path']);
-            $build->setAttribute('size', $response['size']);
-            $build->setAttribute('logs', $response['output']);
-
-            $build = $dbForProject->updateDocument('builds', $buildId, $build);
-
-            if ($isVcsEnabled) {
-                $this->runGitAction('ready', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForConsole);
-            }
-
-            Console::success("Build id: $buildId created");
-
-            /** Set auto deploy */
-            if ($deployment->getAttribute('activate') === true) {
-                $resource->setAttribute('deploymentInternalId', $deployment->getInternalId());
-                $resource->setAttribute('deployment', $deployment->getId());
-                $resource->setAttribute('live', true);
-                $resource = $dbForProject->updateDocument('functions', $resource->getId(), $resource);
-            }
-
-            if ($dbForProject->getDocument('builds', $buildId)->getAttribute('status') === 'canceled') {
-                Console::info('Build has been canceled');
-                return;
-            }
-
-            /** Update function schedule */
-
-            // Inform scheduler if function is still active
-            if ($isFunction) {
-                $schedule = $dbForConsole->getDocument('schedules', $resource->getAttribute('scheduleId'));
-                $schedule
-                    ->setAttribute('resourceUpdatedAt', DateTime::now())
-                    ->setAttribute('schedule', $resource->getAttribute('schedule'))
-                    ->setAttribute('active', !empty($resource->getAttribute('schedule')) && !empty($resource->getAttribute('deployment')));
-                Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-            }
-        } catch (\Throwable $th) {
-            if ($dbForProject->getDocument('builds', $buildId)->getAttribute('status') === 'canceled') {
-                Console::info('Build has been canceled');
-                return;
-            }
-
-            $endTime = DateTime::now();
-            $durationEnd = \microtime(true);
-            $build->setAttribute('endTime', $endTime);
-            $build->setAttribute('duration', \intval(\ceil($durationEnd - $durationStart)));
-            $build->setAttribute('status', 'failed');
-            $build->setAttribute('logs', $th->getMessage());
-
-            $build = $dbForProject->updateDocument('builds', $buildId, $build);
-
-            if ($isVcsEnabled) {
-                $this->runGitAction('failed', $github, $providerCommitHash, $owner, $repositoryName, $project, $resource, $deployment->getId(), $dbForProject, $dbForConsole);
-            }
-        } finally {
-            /**
-             * Send realtime Event
-             */
-            $target = Realtime::fromPayload(
-                // Pass first, most verbose event pattern
-                event: $allEvents[0],
-                payload: $build,
-                project: $project
-            );
-            Realtime::send(
-                projectId: 'console',
-                payload: $build->getArrayCopy(),
-                events: $allEvents,
-                channels: $target['channels'],
-                roles: $target['roles']
-            );
-
-            /** Trigger usage queue */
-            if ($build->getAttribute('status') === 'ready') {
-                if ($isFunction) {
-                    $queueForUsage
-                        ->addMetric(METRIC_BUILDS_SUCCESS, 1) // per project
-                        ->addMetric(METRIC_BUILDS_COMPUTE_SUCCESS, (int)$build->getAttribute('duration', 0) * 1000)
-                        ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_SUCCESS), 1) // per function
-                        ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS), (int)$build->getAttribute('duration', 0) * 1000);
-                }
-            } elseif ($build->getAttribute('status') === 'failed') {
-                if ($isFunction) {
-                    $queueForUsage
-                        ->addMetric(METRIC_BUILDS_FAILED, 1) // per project
-                        ->addMetric(METRIC_BUILDS_COMPUTE_FAILED, (int)$build->getAttribute('duration', 0) * 1000)
-                        ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_FAILED), 1) // per function
-                        ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED), (int)$build->getAttribute('duration', 0) * 1000);
-                }
-            }
-            if ($isFunction) {
-                $queueForUsage
-                    ->addMetric(METRIC_BUILDS, 1) // per project
-                    ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
-                    ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
-                    ->addMetric(METRIC_BUILDS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $build->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
-                    ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS), 1) // per function
-                    ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
-                    ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
-                    ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $build->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
-                    ->setProject($project)
-                    ->trigger();
-            }
-        }
-    }
-
-    /**
-     * @param string $status
-     * @param GitHub $github
-     * @param string $providerCommitHash
-     * @param string $owner
-     * @param string $repositoryName
-     * @param Document $project
-     * @param Document $resource
-     * @param string $deploymentId
-     * @param Database $dbForProject
-     * @param Database $dbForConsole
-     * @return void
-     * @throws Structure
-     * @throws \Utopia\Database\Exception
-     * @throws Authorization
-     * @throws Conflict
-     * @throws Restricted
-     */
-    protected function runGitAction(string $status, GitHub $github, string $providerCommitHash, string $owner, string $repositoryName, Document $project, Document $resource, string $deploymentId, Database $dbForProject, Database $dbForConsole): void
-    {
-        if ($resource->getAttribute('providerSilentMode', false) === true) {
-            return;
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        $commentId = $deployment->getAttribute('providerCommentId', '');
-
-        if (!empty($providerCommitHash)) {
-            $message = match ($status) {
-                'ready' => 'Build succeeded.',
-                'failed' => 'Build failed.',
-                'processing' => 'Building...',
-                default => $status
-            };
-
-            $state = match ($status) {
-                'ready' => 'success',
-                'failed' => 'failure',
-                'processing' => 'pending',
-                default => $status
-            };
-
-            $resourceName = $resource->getAttribute('name');
-            $projectName = $project->getAttribute('name');
-
-            $name = "{$resourceName} ({$projectName})";
-
-            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $hostname = System::getEnv('_APP_DOMAIN');
-            $providerTargetUrl = "{$protocol}://{$hostname}/console/project-{$project->getId()}/functions/function-{$resource->getId()}";
-
-            $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, $state, $message, $providerTargetUrl, $name);
-        }
-
-        if (!empty($commentId)) {
-            $retries = 0;
-
-            while (true) {
-                $retries++;
-
-                try {
-                    $dbForConsole->createDocument('vcsCommentLocks', new Document([
-                        '$id' => $commentId
-                    ]));
-                    break;
-                } catch (\Throwable $err) {
-                    if ($retries >= 9) {
-                        throw $err;
-                    }
-
-                    \sleep(1);
-                }
-            }
-
-            // Wrap in try/finally to ensure lock file gets deleted
-            try {
-                $comment = new Comment();
-                $comment->parseComment($github->getComment($owner, $repositoryName, $commentId));
-                $comment->addBuild($project, $resource, $status, $deployment->getId(), ['type' => 'logs']);
-                $github->updateComment($owner, $repositoryName, $commentId, $comment->generateComment());
-            } finally {
-                $dbForConsole->deleteDocument('vcsCommentLocks', $commentId);
-            }
-        }
-    }
-}
diff --git a/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php b/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php
index a82b8008cc..d5c651f3f8 100644
--- a/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php
+++ b/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php
@@ -28,6 +28,12 @@ class ConsoleVariables extends Model
                 'default' => '',
                 'example' => '30000000',
             ])
+            ->addRule('_APP_SITES_SIZE_LIMIT', [
+                'type' => self::TYPE_INTEGER,
+                'description' => 'Maximum file size allowed for site deployment in bytes.',
+                'default' => '',
+                'example' => '30000000',
+            ])
             ->addRule('_APP_USAGE_STATS', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Defines if usage stats are enabled. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'.',
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index c230cfb664..a01a9efb40 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -62,6 +62,7 @@ class Executor
         string $version,
         float $cpus,
         int $memory,
+        int $timeout,
         bool $remove = false,
         string $entrypoint = '',
         string $destination = '',
@@ -70,7 +71,6 @@ class Executor
     ) {
         $runtimeId = "$projectId-$deploymentId-build";
         $route = "/runtimes";
-        $timeout = (int) System::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
 
         // Remove after migration
         if ($version == 'v3') {
diff --git a/tests/e2e/Services/Console/ConsoleConsoleClientTest.php b/tests/e2e/Services/Console/ConsoleConsoleClientTest.php
index ca9287cdca..cd85879cf8 100644
--- a/tests/e2e/Services/Console/ConsoleConsoleClientTest.php
+++ b/tests/e2e/Services/Console/ConsoleConsoleClientTest.php
@@ -28,6 +28,7 @@ class ConsoleConsoleClientTest extends Scope
         $this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
         $this->assertIsInt($response['body']['_APP_STORAGE_LIMIT']);
         $this->assertIsInt($response['body']['_APP_FUNCTIONS_SIZE_LIMIT']);
+        $this->assertIsInt($response['body']['_APP_SITES_SIZE_LIMIT']);
         $this->assertIsString($response['body']['_APP_DOMAIN_TARGET']);
         $this->assertIsBool($response['body']['_APP_DOMAIN_ENABLED']);
         $this->assertIsBool($response['body']['_APP_VCS_ENABLED']);