diff --git a/compose.yaml b/compose.yaml
index ca48f32..3f1b5a9 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -22,14 +22,11 @@ services:
       - TOKEN=Dj-xnGfioO4x2UcAS72ipxRzhP9PSJUS6F8R66vI2WQ
 
 
-volumes:
-  db_storage:
-  n8n_storage:
-
-services:
   postgres:
     image: postgres:16
     restart: always
+    networks:
+      - braig-local
     environment:
       - POSTGRES_USER
       - POSTGRES_PASSWORD
@@ -54,14 +51,14 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PORT=5432
-      - DB_POSTGRESDB_DATABASE=n8n
-      - DB_POSTGRESDB_USER=tobi
+      - DB_POSTGRESDB_DATABASE=${POSTGRES_DB}
+      - DB_POSTGRESDB_USER=${POSTGRES_NON_ROOT_USER}
       - DB_POSTGRESDB_PASSWORD=${POSTGRES_NON_ROOT_PASSWORD}
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_AUTH_TOKEN=${RUNNERS_AUTH_TOKEN}
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
-#    ports:
-#      - 5678:5678
+    ports:
+      - 5678:5678
     links:
       - postgres
     volumes:
@@ -72,15 +69,20 @@ services:
 
   n8n-runner:
     image: n8nio/runners:${N8N_VERSION}
+    networks:
+      - braig-local
     restart: always
     environment:
       - N8N_RUNNERS_AUTH_TOKEN=${RUNNERS_AUTH_TOKEN}
       - N8N_RUNNERS_TASK_BROKER_URI=http://n8n:5679
-    networks:
-      - bragi-local
     depends_on:
       - n8n
 
+volumes:
+  db_storage:
+  n8n_storage:
+  
+
 networks:
   bragi-local:
       external: true
\ No newline at end of file