diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 95decdcc..45b30d09 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,6 +7,10 @@ on:
     tags:
       - 'v*'
 
+concurrency:
+  group: deploy-klz-cables
+  cancel-in-progress: false
+
 jobs:
   # ──────────────────────────────────────────────────────────────────────────────
   # JOB 1: Prepare & Determine Environment
@@ -19,6 +23,8 @@ jobs:
       image_tag:        ${{ steps.determine.outputs.image_tag }}
       env_file:         ${{ steps.determine.outputs.env_file }}
       traefik_host:     ${{ steps.determine.outputs.traefik_host }}
+      next_public_base_url: ${{ steps.determine.outputs.next_public_base_url }}
+      directus_url:     ${{ steps.determine.outputs.directus_url }}
       is_prod:          ${{ steps.determine.outputs.is_prod }}
       gotify_title:     ${{ steps.determine.outputs.gotify_title }}
       gotify_priority:  ${{ steps.determine.outputs.gotify_priority }}
@@ -43,6 +49,8 @@ jobs:
             IMAGE_TAG="main-${SHORT_SHA}"
             ENV_FILE=".env.testing"
             TRAEFIK_HOST="\`testing.klz-cables.com\`"
+            NEXT_PUBLIC_BASE_URL="https://testing.klz-cables.com"
+            DIRECTUS_URL="https://cms-testing.klz-cables.com"
             IS_PROD="false"
             GOTIFY_TITLE="🧪 Testing-Deploy"
             GOTIFY_PRIORITY=4
@@ -52,6 +60,8 @@ jobs:
               IMAGE_TAG="$TAG"
               ENV_FILE=".env.prod"
               TRAEFIK_HOST="\`klz-cables.com\`, \`www.klz-cables.com\`"
+              NEXT_PUBLIC_BASE_URL="https://klz-cables.com"
+              DIRECTUS_URL="https://cms.klz-cables.com"
               IS_PROD="true"
               GOTIFY_TITLE="🚀 Production-Release"
               GOTIFY_PRIORITY=6
@@ -60,6 +70,8 @@ jobs:
               IMAGE_TAG="$TAG"
               ENV_FILE=".env.staging"
               TRAEFIK_HOST="\`staging.klz-cables.com\`"
+              NEXT_PUBLIC_BASE_URL="https://staging.klz-cables.com"
+              DIRECTUS_URL="https://cms-staging.klz-cables.com"
               IS_PROD="false"
               GOTIFY_TITLE="🧪 Staging-Deploy (Pre-Release)"
               GOTIFY_PRIORITY=5
@@ -76,6 +88,8 @@ jobs:
           echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
           echo "env_file=$ENV_FILE" >> $GITHUB_OUTPUT
           echo "traefik_host=$TRAEFIK_HOST" >> $GITHUB_OUTPUT
+          echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL" >> $GITHUB_OUTPUT
+          echo "directus_url=$DIRECTUS_URL" >> $GITHUB_OUTPUT
           echo "is_prod=$IS_PROD" >> $GITHUB_OUTPUT
           echo "gotify_title=$GOTIFY_TITLE" >> $GITHUB_OUTPUT
           echo "gotify_priority=$GOTIFY_PRIORITY" >> $GITHUB_OUTPUT
@@ -130,10 +144,10 @@ jobs:
         env:
           IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }}
           TARGET:    ${{ needs.prepare.outputs.target }}
-          NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_BASE_URL          || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_BASE_URL          || secrets.TESTING_NEXT_PUBLIC_BASE_URL          || secrets.NEXT_PUBLIC_BASE_URL) }}
+          NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.next_public_base_url }}
           NEXT_PUBLIC_UMAMI_WEBSITE_ID:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.TESTING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID) }}
           NEXT_PUBLIC_UMAMI_SCRIPT_URL:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
-          DIRECTUS_URL:                  ${{ needs.prepare.outputs.target == 'production' && 'https://cms.klz-cables.com' || (needs.prepare.outputs.target == 'staging' && 'https://cms-staging.klz-cables.com' || 'https://cms-testing.klz-cables.com') }}
+          DIRECTUS_URL:                  ${{ needs.prepare.outputs.directus_url }}
         run: |
           echo "🏗️ Building → $TARGET / $IMAGE_TAG"
           docker buildx build \
@@ -158,7 +172,7 @@ jobs:
       IMAGE_TAG:            ${{ needs.prepare.outputs.image_tag }}
       ENV_FILE:             ${{ needs.prepare.outputs.env_file }}
       TRAEFIK_HOST:         ${{ needs.prepare.outputs.traefik_host }}
-      NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_BASE_URL          || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_BASE_URL          || secrets.TESTING_NEXT_PUBLIC_BASE_URL          || secrets.NEXT_PUBLIC_BASE_URL) }}
+      NEXT_PUBLIC_BASE_URL:          ${{ needs.prepare.outputs.next_public_base_url }}
       NEXT_PUBLIC_UMAMI_WEBSITE_ID:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.TESTING_NEXT_PUBLIC_UMAMI_WEBSITE_ID  || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID) }}
       NEXT_PUBLIC_UMAMI_SCRIPT_URL:  ${{ needs.prepare.outputs.target == 'production' && secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL  || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.TESTING_NEXT_PUBLIC_UMAMI_SCRIPT_URL  || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL) }}
       SENTRY_DSN:                    ${{ needs.prepare.outputs.target == 'production' && secrets.SENTRY_DSN                    || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_SENTRY_DSN                    || secrets.TESTING_SENTRY_DSN                    || secrets.SENTRY_DSN) }}
@@ -168,7 +182,7 @@ jobs:
       MAIL_PASSWORD:                 ${{ secrets.MAIL_PASSWORD }}
       MAIL_FROM:                     ${{ secrets.MAIL_FROM }}
       MAIL_RECIPIENTS:               ${{ secrets.MAIL_RECIPIENTS }}
-      DIRECTUS_URL:                  ${{ needs.prepare.outputs.target == 'production' && 'https://cms.klz-cables.com' || (needs.prepare.outputs.target == 'staging' && 'https://cms-staging.klz-cables.com' || 'https://cms-testing.klz-cables.com') }}
+      DIRECTUS_URL:                  ${{ needs.prepare.outputs.directus_url }}
       DIRECTUS_KEY:                  ${{ secrets.DIRECTUS_KEY }}
       DIRECTUS_SECRET:               ${{ secrets.DIRECTUS_SECRET }}
       DIRECTUS_ADMIN_EMAIL:          ${{ secrets.DIRECTUS_ADMIN_EMAIL }}