diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 929593f..1fae831 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -112,12 +112,44 @@ services:
       start_period: 10s
     networks:
       - suitecoffee-net
+  suitecoffee-dbeaver:
+    image: dbeaver/cloudbeaver:latest
+    container_name: suitecoffee-dbeaver
+    depends_on:
+      suitecoffee-tenants:
+        condition: service_healthy
+      suitecoffee-db:
+        condition: service_healthy
+    restart: unless-stopped
+    ports:
+      - "8978:8978"
+    volumes:
+      - dbeaver_logs:/opt/cloudbeaver/logs
+      - dbeaver_workspace:/opt/cloudbeaver/workspace
+    networks:
+      - suitecoffee-net
 
+  # suitecoffee-adminer:
+  #   image: adminer:latest
+  #   container_name: suitecoffee-adminer
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8080:8080"
+  #   depends_on:
+  #     suitecoffee-tenants:
+  #       condition: service_healthy
+  #     suitecoffee-db:
+  #       condition: service_healthy
+  #   networks:
+  #     - suitecoffee-net
+    
 volumes:
   tenants-data:
   suitecoffee-data:
   npm_data:
   npm_letsencrypt:
+  dbeaver_logs:
+  dbeaver_workspace:
 
 networks:
   suitecoffee-net:
diff --git a/services/app/package-lock.json b/services/app/package-lock.json
index 0182212..1b0e26c 100644
--- a/services/app/package-lock.json
+++ b/services/app/package-lock.json
@@ -14,7 +14,8 @@
         "dotenv": "^17.2.1",
         "express": "^5.1.0",
         "express-ejs-layouts": "^2.5.1",
-        "pg": "^8.16.3"
+        "pg": "^8.16.3",
+        "pg-format": "^1.0.4"
       },
       "devDependencies": {
         "cross-env": "^10.0.0",
@@ -882,6 +883,15 @@
       "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
       "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w=="
     },
+    "node_modules/pg-format": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
+      "integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/pg-int8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
diff --git a/services/app/package.json b/services/app/package.json
index 89a8633..3ea9fd3 100644
--- a/services/app/package.json
+++ b/services/app/package.json
@@ -20,7 +20,8 @@
     "express": "^5.1.0",
     "express-ejs-layouts": "^2.5.1",
     "pg": "^8.16.3",
-    "chalk": "^5.3.0"
+    "chalk": "^5.3.0",
+    "pg-format": "^1.0.4" 
   },
   "keywords": [],
   "description": ""
diff --git a/services/auth/package-lock.json b/services/auth/package-lock.json
index 7582fa4..f6ba842 100644
--- a/services/auth/package-lock.json
+++ b/services/auth/package-lock.json
@@ -15,7 +15,8 @@
         "dotenv": "^17.2.1",
         "express": "^5.1.0",
         "express-ejs-layouts": "^2.5.1",
-        "pg": "^8.16.3"
+        "pg": "^8.16.3",
+        "pg-format": "^1.0.4"
       },
       "devDependencies": {
         "cross-env": "^10.0.0",
@@ -1326,6 +1327,15 @@
       "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
       "license": "MIT"
     },
+    "node_modules/pg-format": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
+      "integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/pg-int8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
diff --git a/services/auth/package.json b/services/auth/package.json
index f61b0d6..2b71c5f 100644
--- a/services/auth/package.json
+++ b/services/auth/package.json
@@ -21,7 +21,8 @@
     "express-ejs-layouts": "^2.5.1",
     "pg": "^8.16.3",
     "bcrypt": "^5.1.1",
-    "chalk": "^5.3.0"
+    "chalk": "^5.3.0",
+    "pg-format": "^1.0.4" 
   },
   "keywords": [],
   "description": ""