diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 68020fc..8082f46 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -228,6 +228,7 @@ jobs:
         env:
           TRAEFIK_RULE:     ${{ needs.prepare.outputs.traefik_rule }}
           TRAEFIK_HOST:     ${{ needs.prepare.outputs.traefik_host }}
+          GATEKEEPER_HOST:  gatekeeper.${{ needs.prepare.outputs.traefik_host }}
           ENV_FILE:         ${{ needs.prepare.outputs.env_file }}
         run: |
           # Generate Environment File
@@ -275,8 +276,8 @@ jobs:
           ENV_FILE=$ENV_FILE
           TRAEFIK_RULE='$TRAEFIK_RULE'
           TRAEFIK_HOST='$TRAEFIK_HOST'
-          GATEKEEPER_HOST='gatekeeper.$TRAEFIK_HOST'
-          EOF
+          GATEKEEPER_HOST='$GATEKEEPER_HOST'
+EOF
 
           # AUTH_MIDDLEWARE logic
           printf "AUTH_MIDDLEWARE=%s\n" "$( [[ "$TARGET" == "production" ]] && echo "compress" || echo "${PROJECT_NAME}-auth,compress" )" >> .env.deploy
diff --git a/docker-compose.yml b/docker-compose.yml
index f310baf..a87d0e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls=true"
       - "traefik.http.routers.${PROJECT_NAME}-gatekeeper.service=${PROJECT_NAME}-gatekeeper"
 
-      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.address=http://${PROJECT_NAME}-gatekeeper:3000/api/verify"
+      - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.address=http://${PROJECT_NAME}-gatekeeper:3000/gatekeeper/api/verify"
       - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.trustForwardHeader=true"
       - "traefik.http.middlewares.${PROJECT_NAME}-auth.forwardauth.authResponseHeaders=X-Auth-User"
       - "traefik.docker.network=infra"