diff --git a/compose/.env.demo.example b/compose/.env.demo.example
index 544f7e4..2c54a73 100644
--- a/compose/.env.demo.example
+++ b/compose/.env.demo.example
@@ -14,6 +14,7 @@ BACKEND_PORT=3001
 # Frontend
 FRONTEND_PORT=4322
 API_BASE=http://localhost:3001
+INTERNAL_API_BASE=http://backend:3000
 
 # Demo mode is always enabled for this deployment
 # This enables:
diff --git a/compose/.env.production.example b/compose/.env.production.example
index 8b62b07..87cadd1 100644
--- a/compose/.env.production.example
+++ b/compose/.env.production.example
@@ -14,5 +14,6 @@ BACKEND_PORT=3000
 # Frontend
 FRONTEND_PORT=4321
 API_BASE=https://your-domain.com
+INTERNAL_API_BASE=http://backend:3000
 
 # Note: DEMO_MODE is always false for production
diff --git a/compose/demo.yml b/compose/demo.yml
index 024c486..2955c1c 100644
--- a/compose/demo.yml
+++ b/compose/demo.yml
@@ -1,8 +1,8 @@
 version: "3.9"
 
 # Demo deployment - includes demo users, seed data, and restricted actions
-# Usage: podman-compose -f compose/demo.yml up -d
-# Reset: podman-compose -f compose/demo.yml down -v && podman-compose -f compose/demo.yml up -d
+# Usage: podman-compose --env-file compose/.env.demo -f compose/demo.yml up -d
+# Reset: podman-compose --env-file compose/.env.demo -f compose/demo.yml down -v; podman-compose --env-file compose/.env.demo -f compose/demo.yml up -d
 
 services:
   postgres:
@@ -27,6 +27,8 @@ services:
     build:
       context: ../backend
       dockerfile: Dockerfile
+      args:
+        INCLUDE_DEMO_SEED: "true"
     container_name: likwid-demo-backend
     restart: unless-stopped
     ports:
@@ -53,6 +55,7 @@ services:
     ports:
       - "${FRONTEND_PORT:-4322}:4321"
     environment:
+      INTERNAL_API_BASE: http://backend:3000
       API_BASE: ${API_BASE:-http://localhost:3001}
     depends_on:
       - backend
diff --git a/compose/dev.yml b/compose/dev.yml
index 4ce8a56..50aa2d0 100644
--- a/compose/dev.yml
+++ b/compose/dev.yml
@@ -7,9 +7,9 @@ services:
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER:-likwid}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-likwid}
+      POSTGRES_DB: ${POSTGRES_DB:-likwid}
     volumes:
       - pgdata:/var/lib/postgresql/data
 
diff --git a/compose/production.yml b/compose/production.yml
index ef066d7..96f0fa8 100644
--- a/compose/production.yml
+++ b/compose/production.yml
@@ -26,6 +26,8 @@ services:
     build:
       context: ../backend
       dockerfile: Dockerfile
+      args:
+        INCLUDE_DEMO_SEED: "false"
     container_name: likwid-prod-backend
     restart: unless-stopped
     ports:
@@ -52,6 +54,7 @@ services:
     ports:
       - "${FRONTEND_PORT:-4321}:4321"
     environment:
+      INTERNAL_API_BASE: http://backend:3000
       API_BASE: ${API_BASE:-http://localhost:3000}
     depends_on:
       - backend