diff --git a/.github/workflows/deployment-status.yml b/.github/workflows/deployment-status.yml
index 49d1381..f91e473 100644
--- a/.github/workflows/deployment-status.yml
+++ b/.github/workflows/deployment-status.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Check Development Status
       run: |
         echo "🧪 Checking Development Environment..."
-        DEV_URL="https://${{ secrets.DEV_DOMAIN }}"
+        DEV_URL="https://${{ secrets.DEV_CANONICAL_DOMAIN }}"
         
         DEV_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -L --max-time 30 "$DEV_URL" || echo "000")
         DEV_VERSION=$(curl -s -L --max-time 30 "$DEV_URL" | grep -o '<title>[^<]*</title>' | sed 's/<title>\(.*\)<\/title>/\1/' || echo "Unknown")
@@ -28,7 +28,7 @@ jobs:
     - name: Check Staging Status
       run: |
         echo "🎭 Checking Staging Environment..."
-        STAGING_URL="https://${{ secrets.STAGING_DOMAIN }}"
+        STAGING_URL="https://${{ secrets.STAGING_CANONICAL_DOMAIN }}"
         
         STAGING_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -L --max-time 30 "$STAGING_URL" || echo "000")
         STAGING_VERSION=$(curl -s -L --max-time 30 "$STAGING_URL" | grep -o '<title>[^<]*</title>' | sed 's/<title>\(.*\)<\/title>/\1/' || echo "Unknown")
@@ -41,7 +41,7 @@ jobs:
     - name: Check Production Status
       run: |
         echo "🚀 Checking Production Environment..."
-        PROD_URL="https://${{ secrets.PROD_DOMAIN }}"
+        PROD_URL="https://${{ secrets.PROD_CANONICAL_DOMAIN }}"
         
         PROD_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -L --max-time 30 "$PROD_URL" || echo "000")
         PROD_VERSION=$(curl -s -L --max-time 30 "$PROD_URL" | grep -o '<title>[^<]*</title>' | sed 's/<title>\(.*\)<\/title>/\1/' || echo "Unknown")
@@ -64,7 +64,7 @@ jobs:
         else
           DEV_ICON="❌"
         fi
-        echo "| 🧪 Development | $DEV_ICON HTTP $DEV_STATUS | $DEV_VERSION | https://${{ secrets.DEV_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
+        echo "| 🧪 Development | $DEV_ICON HTTP $DEV_STATUS | $DEV_VERSION | https://${{ secrets.DEV_CANONICAL_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
         
         # Staging status
         if [ "$STAGING_STATUS" = "200" ]; then
@@ -72,7 +72,7 @@ jobs:
         else
           STAGING_ICON="❌"
         fi
-        echo "| 🎭 Staging | $STAGING_ICON HTTP $STAGING_STATUS | $STAGING_VERSION | https://${{ secrets.STAGING_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
+        echo "| 🎭 Staging | $STAGING_ICON HTTP $STAGING_STATUS | $STAGING_VERSION | https://${{ secrets.STAGING_CANONICAL_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
         
         # Production status
         if [ "$PROD_STATUS" = "200" ]; then
@@ -80,7 +80,7 @@ jobs:
         else
           PROD_ICON="❌"
         fi
-        echo "| 🚀 Production | $PROD_ICON HTTP $PROD_STATUS | $PROD_VERSION | https://${{ secrets.PROD_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
+        echo "| 🚀 Production | $PROD_ICON HTTP $PROD_STATUS | $PROD_VERSION | https://${{ secrets.PROD_CANONICAL_DOMAIN }} |" >> $GITHUB_STEP_SUMMARY
         
         echo "" >> $GITHUB_STEP_SUMMARY
         echo "### 🔧 Emergency Actions Available" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/promote-to-production.yml b/.github/workflows/promote-to-production.yml
index f9e1d4d..c3845f7 100644
--- a/.github/workflows/promote-to-production.yml
+++ b/.github/workflows/promote-to-production.yml
@@ -102,9 +102,9 @@ jobs:
         echo "### 🎮 Deployment Status" >> $GITHUB_STEP_SUMMARY
         
         # Use canonical domain format (these are the Knative domains)
-        DEV_URL="https://${{ secrets.DEV_DOMAIN }}"
-        STAGING_URL="https://${{ secrets.STAGING_DOMAIN }}"
-        PROD_URL="https://${{ secrets.PROD_DOMAIN }}"
+        DEV_URL="https://${{ secrets.DEV_CANONICAL_DOMAIN }}"
+        STAGING_URL="https://${{ secrets.STAGING_CANONICAL_DOMAIN }}"
+        PROD_URL="https://${{ secrets.PROD_CANONICAL_DOMAIN }}"
         
         echo "- **Development**: ✅ Live at $DEV_URL" >> $GITHUB_STEP_SUMMARY
         echo "- **Staging**: ✅ Live at $STAGING_URL" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
index f171fa1..493fc3a 100644
--- a/.github/workflows/smoke-test.yml
+++ b/.github/workflows/smoke-test.yml
@@ -44,15 +44,15 @@ jobs:
       run: |
         case "${{ matrix.environment }}" in
           dev)
-            echo "CANONICAL_DOMAIN=https://${{ secrets.DEV_DOMAIN }}" >> $GITHUB_ENV
+            echo "CANONICAL_DOMAIN=https://${{ secrets.DEV_CANONICAL_DOMAIN }}" >> $GITHUB_ENV
             echo "ENV_NAME=development" >> $GITHUB_ENV
             ;;
           staging)
-            echo "CANONICAL_DOMAIN=https://${{ secrets.STAGING_DOMAIN }}" >> $GITHUB_ENV
+            echo "CANONICAL_DOMAIN=https://${{ secrets.STAGING_CANONICAL_DOMAIN }}" >> $GITHUB_ENV
             echo "ENV_NAME=staging" >> $GITHUB_ENV
             ;;
           prod)
-            echo "CANONICAL_DOMAIN=https://${{ secrets.PROD_DOMAIN }}" >> $GITHUB_ENV
+            echo "CANONICAL_DOMAIN=https://${{ secrets.PROD_CANONICAL_DOMAIN }}" >> $GITHUB_ENV
             echo "ENV_NAME=production" >> $GITHUB_ENV
             ;;
         esac
@@ -157,9 +157,9 @@ jobs:
         
         # Canonical domains (Knative domains only)
         canonical_domains=(
-          "${{ secrets.DEV_DOMAIN }}"
-          "${{ secrets.STAGING_DOMAIN }}"
-          "${{ secrets.PROD_DOMAIN }}"
+          "${{ secrets.DEV_CANONICAL_DOMAIN }}"
+          "${{ secrets.STAGING_CANONICAL_DOMAIN }}"
+          "${{ secrets.PROD_CANONICAL_DOMAIN }}"
         )
         
         for domain in "${canonical_domains[@]}"; do
@@ -179,9 +179,9 @@ jobs:
         
         # Canonical domains (Knative domains only)
         canonical_domains=(
-          "${{ secrets.DEV_DOMAIN }}"
-          "${{ secrets.STAGING_DOMAIN }}"
-          "${{ secrets.PROD_DOMAIN }}"
+          "${{ secrets.DEV_CANONICAL_DOMAIN }}"
+          "${{ secrets.STAGING_CANONICAL_DOMAIN }}"
+          "${{ secrets.PROD_CANONICAL_DOMAIN }}"
         )
         
         for domain in "${canonical_domains[@]}"; do
@@ -231,9 +231,9 @@ jobs:
         echo "### Tested Canonical Domains" >> $GITHUB_STEP_SUMMARY
         
         # Use canonical domain format
-        DEV_URL="https://${{ secrets.DEV_DOMAIN }}"
-        STAGING_URL="https://${{ secrets.STAGING_DOMAIN }}"
-        PROD_URL="https://${{ secrets.PROD_DOMAIN }}"
+        DEV_URL="https://${{ secrets.DEV_CANONICAL_DOMAIN }}"
+        STAGING_URL="https://${{ secrets.STAGING_CANONICAL_DOMAIN }}"
+        PROD_URL="https://${{ secrets.PROD_CANONICAL_DOMAIN }}"
         
         echo "- 🧪 Development: $DEV_URL" >> $GITHUB_STEP_SUMMARY
         echo "- 🎭 Staging: $STAGING_URL" >> $GITHUB_STEP_SUMMARY
diff --git a/docs/WORKFLOWS.md b/docs/WORKFLOWS.md
index 5ee1e26..e0f84b2 100644
--- a/docs/WORKFLOWS.md
+++ b/docs/WORKFLOWS.md
@@ -223,9 +223,9 @@ graph TD
 | `DEV_WEBHOOK_URL` | Development deployment endpoint | Deploy to Development |
 | `STAGING_WEBHOOK_URL` | Staging deployment endpoint | Deploy to Staging |
 | `PROD_WEBHOOK_URL` | Production deployment endpoint | Deploy to Production |
-| `DEV_DOMAIN` | Development domain suffix | Smoke Tests |
-| `STAGING_DOMAIN` | Staging domain suffix | Smoke Tests |
-| `PROD_DOMAIN` | Production domain suffix | Smoke Tests |
+| `DEV_CANONICAL_DOMAIN` | Development canonical domain | Smoke Tests |
+| `STAGING_CANONICAL_DOMAIN` | Staging canonical domain | Smoke Tests |
+| `PROD_CANONICAL_DOMAIN` | Production canonical domain | Smoke Tests |
 
 ### Environment URLs