diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 18a9b06a4e..4c41c8bd34 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1709,7 +1709,7 @@ App::post('/v1/functions/:functionId/executions')
                 method: $method,
                 headers: $headers,
                 runtimeEntrypoint: $command,
-                requestTimeout: 15
+                requestTimeout: 30
             );
 
             $headersFiltered = [];
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 0e16f35e29..bc21da50dd 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -139,7 +139,7 @@ function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleReques
         \curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         // \curl_setopt($ch, CURLOPT_HEADER, true);
         \curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        \curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+        \curl_setopt($ch, CURLOPT_TIMEOUT, 30);
 
         $executionResponse = \curl_exec($ch);
         $statusCode = \curl_getinfo($ch, CURLINFO_HTTP_CODE);