diff --git a/.env b/.env
index b8bc2d93c..28161098a 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 _APP_ENV=development
 _APP_LOCALE=en
-_APP_WORKER_PER_CORE=6
+_APP_WORKER_PER_CORE=2
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
@@ -24,7 +24,7 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_MAX=151
+_APP_CONNECTIONS_MAX=251
 _APP_POOL_CLIENTS=14
 _APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
 _APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
diff --git a/app/workers/builds.php b/app/workers/builds.php
index 6b2cfcf66..d26f07ab7 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -254,6 +254,7 @@ class BuildsV1 extends Worker
                 $statsd = $register->get('statsd');
                 $usage = new Stats($statsd);
                 $usage
+                    ->setParam('projectInternalId', $project->getInternalId())
                     ->setParam('projectId', $project->getId())
                     ->setParam('functionId', $function->getId())
                     ->setParam('builds.{scope}.compute', 1)
diff --git a/app/workers/functions.php b/app/workers/functions.php
index 3047bf027..2333cb315 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -152,6 +152,10 @@ Server::setResource('execute', function () {
                 ->setAttribute('status', 'failed')
                 ->setAttribute('statusCode', $th->getCode())
                 ->setAttribute('stderr', $th->getMessage());
+
+            Console::error($th->getTraceAsString());
+            Console::error($th->getFile());
+            Console::error($th->getLine());
             Console::error($th->getMessage());
         }
 
@@ -205,7 +209,7 @@ Server::setResource('execute', function () {
             $usage
                 ->setParam('projectId', $project->getId())
                 ->setParam('projectInternalId', $project->getInternalId())
-                ->setParam('functionId', $function->getId())
+                ->setParam('functionId', $function->getId()) // TODO: We should use functionInternalId in usage stats
                 ->setParam('executions.{scope}.compute', 1)
                 ->setParam('executionStatus', $execution->getAttribute('status', ''))
                 ->setParam('executionTime', $execution->getAttribute('duration'))
diff --git a/docker-compose.yml b/docker-compose.yml
index 59907aaf0..f0e163674 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -126,6 +126,7 @@ services:
       - _APP_DB_USER
       - _APP_DB_PASS
       - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -214,6 +215,7 @@ services:
       - _APP_DB_USER
       - _APP_DB_PASS
       - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -277,6 +279,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
@@ -308,6 +312,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DB_HOST
       - _APP_DB_PORT
@@ -344,6 +350,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DB_HOST
       - _APP_DB_PORT
@@ -377,6 +385,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
@@ -415,6 +425,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -452,6 +464,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DB_HOST
       - _APP_DB_PORT
@@ -490,6 +504,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_SYSTEM_EMAIL_NAME
       - _APP_SYSTEM_EMAIL_ADDRESS
@@ -521,6 +537,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -546,6 +564,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
       - _APP_OPENSSL_KEY_V1
@@ -585,6 +605,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_OPENSSL_KEY_V1
       - _APP_DB_HOST
       - _APP_DB_PORT
@@ -620,6 +642,8 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_CONNECTIONS_MAX
+      - _APP_POOL_CLIENTS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER