diff --git a/docker/docker-compose-test.yaml b/docker/docker-compose-test.yaml
index e134f20..f9941ef 100644
--- a/docker/docker-compose-test.yaml
+++ b/docker/docker-compose-test.yaml
@@ -4,4 +4,5 @@ include:
     - parts/docker-compose-databases.yaml
     - parts/docker-compose-databases-expose.yaml
     - parts/docker-compose-tools.yaml
+    - parts/docker-compose-tools-local.yaml
     - parts/docker-compose-traefik.yaml
\ No newline at end of file
diff --git a/docker/parts/docker-compose-tools-local.yaml b/docker/parts/docker-compose-tools-local.yaml
new file mode 100644
index 0000000..c9c1668
--- /dev/null
+++ b/docker/parts/docker-compose-tools-local.yaml
@@ -0,0 +1,18 @@
+services:
+  pgadmin:
+    environment:
+      PGADMIN_CONFIG_SERVER_MODE: 'False'
+      PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
+    configs:
+      - source: pgpass
+        target: /pgpass
+        mode: 0600
+        uid: "5050"
+        gid: "5050"
+      - source: servers_json
+        target: /pgadmin4/servers.json
+
+configs:
+  pgpass:
+    content: |
+      *:*:*:event-demo:changeit
diff --git a/docker/parts/docker-compose-tools.yaml b/docker/parts/docker-compose-tools.yaml
index 7d24180..ee35d57 100644
--- a/docker/parts/docker-compose-tools.yaml
+++ b/docker/parts/docker-compose-tools.yaml
@@ -4,18 +4,11 @@ services:
     environment:
       PGADMIN_DEFAULT_EMAIL: $PGADMIN_DEFAULT_EMAIL
       PGADMIN_DEFAULT_PASSWORD_FILE: /run/secrets/pgadmin_password
-      PGADMIN_CONFIG_SERVER_MODE: 'False'
-      PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
     secrets:
       - pgadmin_password
     volumes:
       - pgadmin_data:/var/lib/pgadmin
     configs:
-      - source: pgpass
-        target: /pgpass
-        mode: 0600
-        uid: "5050"
-        gid: "5050"
       - source: servers_json
         target: /pgadmin4/servers.json
     labels:
@@ -35,9 +28,6 @@ services:
       - "traefik.http.services.rabbitmq-management.loadbalancer.server.port=15672"
 
 configs:
-  pgpass:
-    content: |
-      *:*:*:event-demo:changeit
   servers_json:
     content: |
       {