diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 3336253..01de540 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -216,6 +216,7 @@ jobs:
           # Authentication
           GATEKEEPER_PASSWORD=${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD }}
           AUTH_COOKIE_NAME=${{ secrets.AUTH_COOKIE_NAME || vars.AUTH_COOKIE_NAME || 'mintel_gatekeeper_session' }}
+          COOKIE_DOMAIN=${{ secrets.COOKIE_DOMAIN || vars.COOKIE_DOMAIN || '.mb-grid-solutions.com' }}
 
           # External Services
           SENTRY_DSN=${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d217efe..9babe4c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,6 +40,9 @@ services:
       PORT: ${PORT:-3000}
       PROJECT_NAME: ${PROJECT_NAME:-MB Grid Solutions}
       PROJECT_COLOR: ${PROJECT_COLOR:-#82ed20}
+      COOKIE_DOMAIN: ${COOKIE_DOMAIN:-.mb-grid-solutions.com}
+      # Dedicated Base URL for Gatekeeper subdomain to prevent redirect loops
+      NEXT_PUBLIC_BASE_URL: https://gatekeeper.${TRAEFIK_HOST:-mb-grid-solutions.localhost}
     labels:
       - "traefik.enable=true"
       - "traefik.http.services.${PROJECT_NAME}-gatekeeper.loadbalancer.server.port=3000"