diff --git a/docker-compose.yml b/docker-compose.yml
index cbd2e9e..44db148 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,19 +12,21 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql
     ports:
-      - "5000:5432"
+      - "${DB_PORT:-5000}:5432"
     networks:
       - local
 
   mailcrab:
     image: marlonb/mailcrab:latest
     ports:
-      - "1080:1080"
+      - "${MAILCRAB_PORT:-1080}:1080"
     networks:
       - rauthy-dev
 
   rauthy:
-    container_name: rauthy-dev
+    # No fixed container_name — Compose derives it from COMPOSE_PROJECT_NAME so
+    # several isolated stacks coexist (e.g. mv-<issue>-rauthy-1). A plain
+    # checkout gets <dir>-rauthy-1.
     image: ghcr.io/sebadob/rauthy:0.35.2
     environment:
       - LOCAL_TEST=true
@@ -32,7 +34,8 @@ services:
       - SMTP_PORT=1025
       - SMTP_DANGER_INSECURE=true
       - LISTEN_SCHEME=http
-      - PUB_URL=localhost:8080
+      # Advertised URL must match the host-mapped port below.
+      - PUB_URL=localhost:${RAUTHY_PORT:-8080}
       - BOOTSTRAP_ADMIN_PASSWORD_PLAIN=RauthyTest12345
       # Disable strict IP validation to allow access from multiple Docker networks
       - SESSION_VALIDATE_IP=false
@@ -40,7 +43,7 @@ services:
       # Re-runs after `docker compose down -v` because the DB is empty again.
       - BOOTSTRAP_DIR=/app/bootstrap
     ports:
-      - "8080:8080"
+      - "${RAUTHY_PORT:-8080}:8080"
     depends_on:
       - mailcrab
       - db