diff --git a/.dockerignore b/.dockerignore
index 0e701eb..2e7f622 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
-postgresql
+.postgresql
 .env
diff --git a/.env.dist b/.env.dist
index 20f7a25..03ac6a0 100644
--- a/.env.dist
+++ b/.env.dist
@@ -15,11 +15,4 @@ POSTGRES_IMAGE=postgres:15.0
 POSTGRES_DB=auth
 POSTGRES_PASSWORD=auth
 POSTGRES_USER=auth
-POSTGRES_PORT=5402
-
-# PGADMIN
-PGADMIN_CONTAINER=v3-auth-pgadmin
-PGADMIN_IMAGE=dpage/pgadmin4:6.12
-PGADMIN_EMAIL=it@mobicoop.org
-PGADMIN_PASSWORD=auth
-PGADMIN_PORT=8402
+POSTGRES_PORT=5502
diff --git a/.gitignore b/.gitignore
index 21e6321..72abbee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # custom
-postgresql
+.postgresql
+.env
 
 # compiled output
 /dist
diff --git a/docker-compose.yml b/docker-compose.yml
index 813e3ee..4e5935a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,40 +24,22 @@ services:
   db:
     container_name: ${POSTGRES_CONTAINER}
     image: ${POSTGRES_IMAGE}
-    restart: always
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
-      - "${POSTGRES_PORT:-5402}:5432"
+      - "${POSTGRES_PORT:-5502}:5432"
     volumes:
-      - ./postgresql/.db_data:/var/lib/postgresql/data:rw
+      - .postgresql:/var/lib/postgresql/data:rw
     networks:
       v3-network:
         aliases:
           - v3-auth-db
 
-  pgadmin:
-    container_name: ${PGADMIN_CONTAINER}
-    image: ${PGADMIN_IMAGE}
-    environment:
-      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
-      PGADMIN_CONFIG_SERVER_MODE: 'False'
-    ports:
-      - "${PGADMIN_PORT:-8402}:80"
-    volumes:
-      - ./postgresql/.pgadmin_data:/var/lib/pgadmin:rw
-    restart: unless-stopped
-    networks:
-      v3-network:
-        aliases:
-          - v3-auth-pgadmin
-    depends_on:
-      - db
-
 networks:
   v3-network:
     name: v3-network
     driver: bridge
+    external: true
+