diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 461a30d..778fcb2 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -15,7 +15,7 @@ services:
       timeout: 5s
       retries: 10
     networks:
-      - app
+      - arsenal_iq
 
   backend:
     build:
@@ -25,8 +25,17 @@ services:
     environment:
       PORT: 5000
       NODE_ENV: ${NODE_ENV:-production}
-      DATABASE_URL: postgresql://${POSTGRES_USER:-arsenal}:${POSTGRES_PASSWORD:-arsenal_dev_password}@postgres:5432/${POSTGRES_DB:-arsenal_iq}
+      POSTGRES_HOST: postgres
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: ${POSTGRES_DB:-arsenal_iq}
+      POSTGRES_USER: ${POSTGRES_USER:-arsenal}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-arsenal_dev_password}
       FRONTEND_URL: ${FRONTEND_URL:-https://arsenal.example.com}
+      ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-true}
+      ALLOW_DEMO_ACCOUNT: ${ALLOW_DEMO_ACCOUNT:-false}
+      DEMO_ACCOUNT_EMAIL: ${DEMO_ACCOUNT_EMAIL:-demo@arsenaliq.local}
+      DEMO_ACCOUNT_PASSWORD: ${DEMO_ACCOUNT_PASSWORD:-demo1234}
+      DEMO_ACCOUNT_NAME: ${DEMO_ACCOUNT_NAME:-Demo User}
     depends_on:
       postgres:
         condition: service_healthy
@@ -38,14 +47,14 @@ services:
       - ./backend/node_modules:/app/node_modules
     labels:
       - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy}
+      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik}
       - traefik.http.routers.arsenaliq-api.rule=Host(`${TRAEFIK_API_HOST:-api.arsenal.local}`)
       - traefik.http.routers.arsenaliq-api.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}
       - traefik.http.routers.arsenaliq-api.tls=true
       - traefik.http.services.arsenaliq-api.loadbalancer.server.port=5000
     networks:
-      - app
-      - traefik_proxy
+      - arsenal_iq
+      - traefik
 
   frontend:
     build:
@@ -54,6 +63,8 @@ services:
     container_name: arsenaliq-frontend
     environment:
       VITE_API_BASE_URL: ${VITE_API_BASE_URL:-https://api.arsenal.example.com/api}
+      VITE_ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-true}
+      VITE_ALLOW_DEMO_ACCOUNT: ${ALLOW_DEMO_ACCOUNT:-false}
     depends_on:
       - backend
     command: >
@@ -64,18 +75,18 @@ services:
       - ./frontend/node_modules:/app/node_modules
     labels:
       - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy}
+      - traefik.docker.network=${TRAEFIK_NETWORK:-traefik}
       - traefik.http.routers.arsenaliq-web.rule=Host(`${TRAEFIK_WEB_HOST:-arsenal.local}`)
       - traefik.http.routers.arsenaliq-web.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}
       - traefik.http.routers.arsenaliq-web.tls=true
       - traefik.http.services.arsenaliq-web.loadbalancer.server.port=3000
     networks:
-      - app
-      - traefik_proxy
+      - arsenal_iq
+      - traefik
 
 networks:
-  app:
+  arsenal_iq:
     driver: bridge
-  traefik_proxy:
+  traefik:
     external: true
-    name: ${TRAEFIK_NETWORK:-traefik_proxy}
+    name: ${TRAEFIK_NETWORK:-traefik}
diff --git a/docker-compose.yml b/docker-compose.yml
index e843a2b..23a14b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,15 +9,13 @@ services:
     volumes:
       - ./data/postgres:/var/lib/postgresql/data
       - ./backend/database/init.sql:/docker-entrypoint-initdb.d/01-init.sql:ro
-    ports:
-      - "5432:5432"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-arsenal} -d ${POSTGRES_DB:-arsenal_iq}"]
       interval: 10s
       timeout: 5s
       retries: 10
     networks:
-      - app
+      - arsenal_iq
 
   backend:
     build:
@@ -50,7 +48,7 @@ services:
       - ./backend:/app
       - ./backend/node_modules:/app/node_modules
     networks:
-      - app
+      - arsenal_iq
 
   frontend:
     build:
@@ -71,9 +69,21 @@ services:
     volumes:
       - ./frontend:/app
       - ./frontend/node_modules:/app/node_modules
+    labels:
+      - ${WATCH:-traefik.enable=true}
+      - "traefik.enable=true"
+      - "traefik.docker.network=${TRAEFIK_NETWORK:-traefik}"
+      - "traefik.http.routers.${NAME:-arsenaliq}.rule=Host(`${URL:-arsenal.local}`)"
+      - "traefik.http.routers.${NAME:-arsenaliq}.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}"
+      - "traefik.http.routers.${NAME:-arsenaliq}.tls.certresolver=${TRAEFIK_CERTRESOLVER:-myresolver}"
+      - "traefik.http.services.${NAME:-arsenaliq}.loadbalancer.server.port=3000"
     networks:
-      - app
+      - arsenal_iq
+      - traefik
 
 networks:
-  app:
+  arsenal_iq:
     driver: bridge
+  traefik:
+    external: true
+    name: ${TRAEFIK_NETWORK:-traefik}