diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5a1549d..b47e7b1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,6 +16,8 @@ services:
       - "traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=3000"
       - "traefik.http.routers.${PROJECT_NAME}.middlewares=${TRAEFIK_MIDDLEWARES:-${PROJECT_NAME}-auth,${PROJECT_NAME}-forward,compress}"
       - "traefik.docker.network=infra"
+    networks:
+      - infra
 
       # Forwarded Headers (Protocol Normalization)
       - "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
@@ -42,14 +44,15 @@ services:
       start_period: 30s
 
   gatekeeper:
-    profiles: [ "gatekeeper" ]
     image: registry.infra.mintel.me/mintel/gatekeeper:v1.7.12
     container_name: ${PROJECT_NAME:-mb-grid-solutions}-gatekeeper
-    restart: always
+    profiles: [ "gatekeeper" ]
+    restart: unless-stopped
     networks:
       infra:
         aliases:
           - ${PROJECT_NAME:-mb-grid-solutions}-gatekeeper
+          - gatekeeper
     env_file:
       - ${ENV_FILE:-.env}
     environment:
@@ -104,8 +107,9 @@ services:
       - "traefik.http.routers.${PROJECT_NAME}-directus.priority=1000"
       - "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${PROJECT_NAME}-forward,compress"
       - "traefik.http.services.${PROJECT_NAME}-directus.loadbalancer.server.port=8055"
-      - "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
       - "traefik.docker.network=infra"
+    networks:
+      - infra
 
   directus-db:
     image: postgres:15-alpine