diff --git a/.env b/.env
index bc58e43b6e..b3a57baae5 100644
--- a/.env
+++ b/.env
@@ -4,7 +4,7 @@ _APP_WORKER_PER_CORE=6
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
 _APP_CONSOLE_WHITELIST_IPS=
-_APP_CONNECTIONS_DB_QUEUES=v1-database-0,v1-database-1
+_APP_CONNECTIONS_QUEUE_PER_WORKER=enabled
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
 _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
diff --git a/app/workers/databases.php b/app/workers/databases.php
index 3342aeb6c4..46a7074623 100644
--- a/app/workers/databases.php
+++ b/app/workers/databases.php
@@ -28,23 +28,13 @@ class DatabaseV1 extends Worker
     {
         global $table, $lock;
 
-        $dbQueues = App::getEnv('_APP_CONNECTIONS_DB_QUEUES');
+        $dbQueues = App::getEnv('_APP_CONNECTIONS_QUEUE_PER_WORKER', 'disabled');
 
-        if (empty($dbQueues)) {
+        if ($dbQueues !== 'enabled') {
             $queue = 'v1-database';
-        } elseif (\str_contains($dbQueues, ',')) {
-            $dbQueues = \explode(',', $dbQueues);
-            $dbQueues = \array_map('trim', $dbQueues);
-            $dbQueues = \array_filter($dbQueues);
-            $dbQueues = \array_values($dbQueues);
-
-            $count = $table->get('databases', 'workerCount');
-
-            Console::log('Database worker count: ' . $count);
-
-            $queue = $dbQueues[$count];
         } else {
-            $queue = \trim($dbQueues);
+            $project = new Document($this->args['project']);
+            $queue = $project->getAttribute('database');
         }
 
         \putenv('QUEUE=' . $queue);