diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0c510b3658..4103cb3c5e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -303,6 +303,8 @@ jobs:
       - name: Failure Logs
         if: failure()
         run: |
+          echo "=== Appwrite Server Logs ==="
+          docker compose logs appwrite
           echo "=== Appwrite Worker Builds Logs ==="
           docker compose logs appwrite-worker-builds
           echo "=== OpenRuntimes Executor Logs ==="
diff --git a/app/init/registers.php b/app/init/registers.php
index 2031d25571..411fd4c69d 100644
--- a/app/init/registers.php
+++ b/app/init/registers.php
@@ -292,7 +292,7 @@ $register->set('pools', function () {
                 },
                 'postgresql' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
                     return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                        return new PDO("pgsql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase}", $dsnUser, $dsnPass, array(
+                        return new PDO("pgsql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};connect_timeout=3", $dsnUser, $dsnPass, array(
                             \PDO::ATTR_TIMEOUT => 3, // Seconds
                             \PDO::ATTR_PERSISTENT => false,
                             \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
@@ -397,7 +397,7 @@ $register->set('db', function () {
             $dsn = "mysql:host={$dbHost};port={$dbPort};dbname={$dbSchema};charset=utf8mb4";
             return new PDO($dsn, $dbUser, $dbPass, SQL::getPDOAttributes());
         case 'postgresql':
-            $dsn = "pgsql:host={$dbHost};port={$dbPort};dbname={$dbSchema}";
+            $dsn = "pgsql:host={$dbHost};port={$dbPort};dbname={$dbSchema};connect_timeout=3";
             return new PDO($dsn, $dbUser, $dbPass, SQL::getPDOAttributes());
         default:
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid database adapter');