diff --git a/app/cli.php b/app/cli.php
index 7c2daf4500..119534a8b9 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -251,7 +251,7 @@ CLI::setResource('logError', function (Registry $register) {
     };
 }, ['register']);
 
-CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
+CLI::setResource('executor', fn () => new Executor());
 
 CLI::setResource('telemetry', fn () => new NoTelemetry());
 
diff --git a/app/init/resources.php b/app/init/resources.php
index 6ca0522b6c..39bdd66a86 100644
--- a/app/init/resources.php
+++ b/app/init/resources.php
@@ -880,7 +880,7 @@ App::setResource('apiKey', function (Request $request, Document $project): ?Key
     return Key::decode($project, $key);
 }, ['request', 'project']);
 
-App::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
+App::setResource('executor', fn () => new Executor());
 
 App::setResource('resourceToken', function ($project, $dbForProject, $request) {
     $tokenJWT = $request->getParam('token');
diff --git a/app/worker.php b/app/worker.php
index c25608cd5e..b596e8bd1b 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -402,7 +402,7 @@ Server::setResource('logError', function (Registry $register, Document $project)
     };
 }, ['register', 'project']);
 
-Server::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
+Server::setResource('executor', fn () => new Executor());
 
 $pools = $register->get('pools');
 $platform = new Appwrite();
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index 955f3851fa..8ead1c82a2 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -19,21 +19,14 @@ class Executor
     public const METHOD_CONNECT = 'CONNECT';
     public const METHOD_TRACE = 'TRACE';
 
-    private bool $selfSigned = false;
-
-    /**
-     * @var callable(string, string): string  $endpoint
-     */
-    private $endpointSelector;
+    protected bool $selfSigned = false;
 
+    protected string $endpoint;
     protected array $headers;
 
-    /**
-     * @param callable(string, string): string $endpointSelector
-     */
-    public function __construct(callable $endpointSelector)
+    public function __construct()
     {
-        $this->endpointSelector = $endpointSelector;
+        $this->endpoint = System::getEnv('_APP_EXECUTOR_HOST', '');
         $this->headers = [
             'content-type' => 'application/json',
             'authorization' => 'Bearer ' . System::getEnv('_APP_EXECUTOR_SECRET', ''),
@@ -97,8 +90,8 @@ class Executor
             'outputDirectory' => $outputDirectory
         ];
 
-        $endpoint = $this->selectEndpoint($projectId, $deploymentId);
-        $response = $this->call($endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout);
+
+        $response = $this->call($this->endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout);
 
         $status = $response['headers']['status-code'];
         if ($status >= 400) {
@@ -128,8 +121,7 @@ class Executor
             'timeout' => $timeout
         ];
 
-        $endpoint = $this->selectEndpoint($projectId, $deploymentId);
-        $this->call($endpoint, self::METHOD_GET, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout, $callback);
+        $this->call($this->endpoint, self::METHOD_GET, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout, $callback);
     }
 
     /**
@@ -145,8 +137,7 @@ class Executor
         $runtimeId = "$projectId-$deploymentId" . $suffix;
         $route = "/runtimes/$runtimeId";
 
-        $endpoint = $this->selectEndpoint($projectId, $deploymentId);
-        $response = $this->call($endpoint, self::METHOD_DELETE, $route, [
+        $response = $this->call($this->endpoint, self::METHOD_DELETE, $route, [
             'x-opr-addressing-method' => 'broadcast'
         ], [], true, 30);
 
@@ -239,8 +230,7 @@ class Executor
             $requestTimeout = $timeout + 15;
         }
 
-        $endpoint = $this->selectEndpoint($projectId, $deploymentId);
-        $response = $this->call($endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId, 'content-type' => 'multipart/form-data', 'accept' => 'multipart/form-data' ], $params, true, $requestTimeout);
+        $response = $this->call($this->endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId, 'content-type' => 'multipart/form-data', 'accept' => 'multipart/form-data' ], $params, true, $requestTimeout);
 
         $status = $response['headers']['status-code'];
         if ($status >= 400) {
@@ -274,8 +264,7 @@ class Executor
             'timeout' => $timeout
         ];
 
-        $endpoint = $this->selectEndpoint($projectId, $deploymentId);
-        $response = $this->call($endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout);
+        $response = $this->call($this->endpoint, self::METHOD_POST, $route, [ 'x-opr-runtime-id' => $runtimeId ], $params, true, $timeout);
 
         $status = $response['headers']['status-code'];
         if ($status >= 400) {
@@ -465,9 +454,4 @@ class Executor
 
         return $output;
     }
-
-    private function selectEndpoint(string $projectId, string $deploymentId): string
-    {
-        return call_user_func($this->endpointSelector, $projectId, $deploymentId);
-    }
 }