diff --git a/app/config/function-templates.php b/app/config/templates/function.php
similarity index 100%
rename from app/config/function-templates.php
rename to app/config/templates/function.php
diff --git a/app/config/site-templates.php b/app/config/templates/site.php
similarity index 100%
rename from app/config/site-templates.php
rename to app/config/templates/site.php
diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php
index c890bf5395..7c84738592 100644
--- a/app/controllers/api/vcs.php
+++ b/app/controllers/api/vcs.php
@@ -865,8 +865,8 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
                     ];
 
                     foreach ($strategies as $strategy) {
-                        $redector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
-                        $redector
+                        $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
+                        $detector
                             ->addOption(new Node())
                             ->addOption(new Bun())
                             ->addOption(new Deno())
@@ -879,7 +879,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
                             ->addOption(new CPP())
                             ->addOption(new Dotnet());
 
-                        $runtime = $redector->detect();
+                        $runtime = $detector->detect();
 
                         if (!\is_null($runtime)) {
                             $runtime = $runtime->getName();
diff --git a/app/init.php b/app/init.php
index 6b57035ce9..ae3d96cd97 100644
--- a/app/init.php
+++ b/app/init.php
@@ -390,8 +390,8 @@ Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
 Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
 Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
 Config::load('specifications', __DIR__ . '/config/specifications.php');
-Config::load('function-templates', __DIR__ . '/config/function-templates.php');
-Config::load('site-templates', __DIR__ . '/config/site-templates.php');
+Config::load('function-templates', __DIR__ . '/config/templates/function.php');
+Config::load('site-templates', __DIR__ . '/config/templates/site.php');
 
 /**
  * New DB Filters
diff --git a/docker-compose.yml b/docker-compose.yml
index c50c12f206..1cf0af5078 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -976,7 +976,7 @@ services:
       # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_IMAGE_PULL=disabled
+      - OPR_EXECUTOR_IMAGE_PULL=enabled
       - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
       - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
       - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index e970b6213d..0d632f6dcd 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -709,6 +709,7 @@ class Builds extends Action
             }
 
             if ($resource->getCollection() === 'sites' && empty($resource->getAttribute('adapter'))) {
+                // TODO: Refactor with structured command in future, using utopia library (CLI)
                 $listFilesCommand = "cd /usr/local/build && cd " . \escapeshellarg($resource->getAttribute('outputDirectory')) . " && find . -name 'node_modules' -prune -o -type f -print";
                 $command = $executor->createCommand(
                     deploymentId: $deployment->getId(),
diff --git a/src/Appwrite/Platform/Tasks/Screenshot.php b/src/Appwrite/Platform/Tasks/Screenshot.php
index 43cf434408..fb0cce3d38 100644
--- a/src/Appwrite/Platform/Tasks/Screenshot.php
+++ b/src/Appwrite/Platform/Tasks/Screenshot.php
@@ -34,7 +34,7 @@ class Screenshot extends Action
         $template = \array_shift($allowedTemplates);
 
         if (empty($template)) {
-            throw new \Exception("Template {$templateId} not found. Find correct ID in app/config/site-templates.php");
+            throw new \Exception("Template {$templateId} not found. Find correct ID in app/config/templates/site.php");
         }
 
         Console::info("Found: " . $template['name']);