diff --git a/docker-compose.yml b/docker-compose.yml
index 90801c5..7c0718b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,11 +2,12 @@ services:
   app:
     build: .
     restart: unless-stopped
+    container_name: worldcup
     depends_on:
       db:
         condition: service_healthy
     environment:
-      DATABASE_URL: postgres://wc:${DB_PASSWORD}@db:5432/worldcup
+      DATABASE_URL: postgres://wc:${DB_PASSWORD}@worldcup_db:5432/worldcup
       NODE_ENV: production
     labels:
       - "traefik.enable=${TRAEFIK_ENABLED:-false}"
@@ -17,7 +18,7 @@ services:
       - "traefik.http.routers.worldcup-web-secure.rule=Host(`${TRAEFIK_HOST}`)"
       - "traefik.http.routers.worldcup-web-secure.tls.certresolver=resolver"
       - "traefik.http.routers.worldcup-web-secure.entrypoints=web-secure"
-      - "traefik.http.routers.worldcup-web-secure.middlewares=security-headers@file,no-index@file"
+      - "traefik.http.routers.worldcup-web-secure.middlewares=security-headers@file"
       - "traefik.http.services.worldcup-web-secure.loadbalancer.server.port=3000"
       - "traefik.docker.network=${NETWORK_NAME}"
     networks:
@@ -26,6 +27,7 @@ services:
   db:
     image: postgres:16-alpine
     restart: unless-stopped
+    container_name: worldcup_db
     environment:
       POSTGRES_DB: worldcup
       POSTGRES_USER: wc