diff --git a/.env.sample b/.env.sample
index 5244d3c41..dad3be411 100644
--- a/.env.sample
+++ b/.env.sample
@@ -23,16 +23,16 @@ AZURE_AI_IMAGE_MODEL_DEPLOYMENT=gpt-image-1-mini
 # Azure OpenAI Configuration
 # =============================================================================
 AI_FOUNDRY_RESOURCE_ID=/subscriptions/your-subscription-id/resourceGroups/your-resource-group/providers/Microsoft.CognitiveServices/accounts/your-aif-account
-AZURE_EXISTING_AI_PROJECT_RESOURCE_ID=/subscriptions/your-subscription-id/resourceGroups/your-resource-group/providers/Microsoft.CognitiveServices/accounts/your-aif-account/projects/your-project-name
+AZURE_ENV_FOUNDRY_PROJECT_RID=/subscriptions/your-subscription-id/resourceGroups/your-resource-group/providers/Microsoft.CognitiveServices/accounts/your-aif-account/projects/your-project-name
 # Your Azure OpenAI endpoint (e.g., https://your-resource.openai.azure.com/)
 AZURE_OPENAI_ENDPOINT=https://your-openai.openai.azure.com/
 
 # Model deployments
-AZURE_OPENAI_GPT_MODEL=gpt-5.1
+AZURE_ENV_GPT_MODEL_NAME=gpt-5.1
 
 # Image Generation Model Configuration
 # Supported models: gpt-image-1-mini or gpt-image-1.5
-AZURE_OPENAI_IMAGE_MODEL=gpt-image-1-mini
+AZURE_ENV_IMAGE_MODEL_NAME=gpt-image-1-mini
 
 # For gpt-image-1-mini or gpt-image-1.5, the endpoint is the same as the main OpenAI endpoint, but you can specify a different one if needed
 AZURE_OPENAI_GPT_IMAGE_ENDPOINT=https://your-openai.openai.azure.com
@@ -43,7 +43,7 @@ AZURE_OPENAI_IMAGE_SIZE=1024x1024
 AZURE_OPENAI_IMAGE_QUALITY=medium
 
 # API versions
-AZURE_OPENAI_API_VERSION=2024-06-01
+AZURE_ENV_OPENAI_API_VERSION=2024-06-01
 AZURE_OPENAI_PREVIEW_API_VERSION=2024-02-01
 
 # Generation parameters
diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index d2a5231f4..776dc799c 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -44,7 +44,7 @@ jobs:
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
-          AZURE_ENV_OPENAI_LOCATION: ${{ secrets.AZURE_ENV_OPENAI_LOCATION }}
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ secrets.AZURE_ENV_AI_SERVICE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  
       # Step 4: Print the result of the validation
diff --git a/.github/workflows/deploy-orchestrator.yml b/.github/workflows/deploy-orchestrator.yml
index 069e2bc91..82de9002f 100644
--- a/.github/workflows/deploy-orchestrator.yml
+++ b/.github/workflows/deploy-orchestrator.yml
@@ -42,12 +42,12 @@ on:
         required: false
         default: 'GoldenPath-Testing'
         type: string
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_ENV_FOUNDRY_PROJECT_RID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -61,7 +61,7 @@ on:
         description: 'Trigger type (workflow_dispatch, pull_request, schedule)'
         required: true
         type: string
-      image_model_choice:
+      AZURE_ENV_IMAGE_MODEL_NAME:
         description: 'Image model to deploy (gpt-image-1-mini, gpt-image-1.5, none)'
         required: false
         default: 'gpt-image-1-mini'
@@ -91,12 +91,12 @@ jobs:
       EXP: ${{ inputs.EXP }}
       build_docker_image: ${{ inputs.build_docker_image }}
       existing_webapp_url: ${{ inputs.existing_webapp_url }}
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
-      docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
+      docker_image_tag: ${{ needs.docker-build.outputs.AZURE_ENV_IMAGE_TAG }}
       run_e2e_tests: ${{ inputs.run_e2e_tests }}
       cleanup_resources: ${{ inputs.cleanup_resources }}
-      image_model_choice: ${{ inputs.image_model_choice }}
+      AZURE_ENV_IMAGE_MODEL_NAME: ${{ inputs.AZURE_ENV_IMAGE_MODEL_NAME }}
     secrets: inherit
 
   e2e-test:
@@ -138,7 +138,7 @@ jobs:
       existing_webapp_url: ${{ inputs.existing_webapp_url }}
       RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
       AZURE_LOCATION: ${{ needs.deploy.outputs.AZURE_LOCATION }}
-      AZURE_ENV_OPENAI_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
+      AZURE_ENV_AI_SERVICE_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
       ENV_NAME: ${{ needs.deploy.outputs.ENV_NAME }}
-      IMAGE_TAG: ${{ needs.deploy.outputs.IMAGE_TAG }}
+      AZURE_ENV_IMAGE_TAG: ${{ needs.deploy.outputs.AZURE_ENV_IMAGE_TAG }}
     secrets: inherit
diff --git a/.github/workflows/deploy-v2.yml b/.github/workflows/deploy-v2.yml
index c6933c4c1..a7ede3ccd 100644
--- a/.github/workflows/deploy-v2.yml
+++ b/.github/workflows/deploy-v2.yml
@@ -85,12 +85,12 @@ on:
           - 'Smoke-Testing'
           - 'None'
       
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_ENV_FOUNDRY_PROJECT_RID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -100,7 +100,7 @@ on:
         required: false
         default: ''
         type: string
-      image_model_choice:
+      AZURE_ENV_IMAGE_MODEL_NAME:
         description: 'Image Model to Deploy'
         required: false
         default: 'gpt-image-1-mini'
@@ -130,10 +130,10 @@ jobs:
       build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
       cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
       run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
-      azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
-      azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ steps.validate.outputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ steps.validate.outputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
       existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
-      image_model_choice: ${{ steps.validate.outputs.image_model_choice }}
+      AZURE_ENV_IMAGE_MODEL_NAME: ${{ steps.validate.outputs.AZURE_ENV_IMAGE_MODEL_NAME }}
     steps:
       - name: Validate Workflow Input Parameters
         id: validate
@@ -147,10 +147,10 @@ jobs:
           INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
           INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
           INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ github.event.inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
           INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
-          INPUT_IMAGE_MODEL_CHOICE: ${{ github.event.inputs.image_model_choice }}
+          INPUT_IMAGE_MODEL_CHOICE: ${{ github.event.inputs.AZURE_ENV_IMAGE_MODEL_NAME }}
         run: |
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=false
@@ -242,32 +242,32 @@ jobs:
             echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
           fi
           
-          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
-          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
-              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
-              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
             fi
           else
-            echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
+            echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
           fi
           
-          # Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
-          if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
-              echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
-              echo "   Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
             fi
           else
-            echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Not provided (optional)"
+            echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Not provided (optional)"
           fi
           
           # Validate existing_webapp_url (optional, must start with https)
@@ -302,19 +302,19 @@ jobs:
           echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
           echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
           echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
-          echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
-          echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
+          echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
+          echo "AZURE_ENV_FOUNDRY_PROJECT_RID=$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" >> $GITHUB_OUTPUT
           echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
           
-          # Validate and output image_model_choice
+          # Validate and output AZURE_ENV_IMAGE_MODEL_NAME
           IMAGE_MODEL="${INPUT_IMAGE_MODEL_CHOICE:-gpt-image-1-mini}"
           ALLOWED_MODELS=("gpt-image-1-mini" "gpt-image-1.5" "none")
           if [[ ! " ${ALLOWED_MODELS[@]} " =~ " ${IMAGE_MODEL} " ]]; then
-            echo "❌ ERROR: image_model_choice '$IMAGE_MODEL' is invalid. Allowed: ${ALLOWED_MODELS[*]}"
+            echo "❌ ERROR: AZURE_ENV_IMAGE_MODEL_NAME '$IMAGE_MODEL' is invalid. Allowed: ${ALLOWED_MODELS[*]}"
             exit 1
           fi
-          echo "✅ image_model_choice: '$IMAGE_MODEL' is valid"
-          echo "image_model_choice=$IMAGE_MODEL" >> $GITHUB_OUTPUT
+          echo "✅ AZURE_ENV_IMAGE_MODEL_NAME: '$IMAGE_MODEL' is valid"
+          echo "AZURE_ENV_IMAGE_MODEL_NAME=$IMAGE_MODEL" >> $GITHUB_OUTPUT
 
   Run:
     needs: validate-inputs
@@ -329,9 +329,9 @@ jobs:
       build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
       cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
       run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID || '' }}
+      AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ needs.validate-inputs.outputs.AZURE_ENV_FOUNDRY_PROJECT_RID || '' }}
       existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
       trigger_type: ${{ github.event_name }}
-      image_model_choice: ${{ needs.validate-inputs.outputs.image_model_choice || 'gpt-image-1-mini' }}
+      AZURE_ENV_IMAGE_MODEL_NAME: ${{ needs.validate-inputs.outputs.AZURE_ENV_IMAGE_MODEL_NAME || 'gpt-image-1-mini' }}
     secrets: inherit
diff --git a/.github/workflows/job-cleanup-deployment.yml b/.github/workflows/job-cleanup-deployment.yml
index c06039378..de81dae14 100644
--- a/.github/workflows/job-cleanup-deployment.yml
+++ b/.github/workflows/job-cleanup-deployment.yml
@@ -28,7 +28,7 @@ on:
         description: 'Azure Location'
         required: true
         type: string
-      AZURE_ENV_OPENAI_LOCATION:
+      AZURE_ENV_AI_SERVICE_LOCATION:
         description: 'Azure OpenAI Location'
         required: true
         type: string
@@ -36,7 +36,7 @@ on:
         description: 'Environment Name'
         required: true
         type: string
-      IMAGE_TAG:
+      AZURE_ENV_IMAGE_TAG:
         description: 'Docker Image Tag'
         required: true
         type: string
@@ -49,9 +49,9 @@ jobs:
     env:
       RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
       AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
-      AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
+      AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
       ENV_NAME: ${{ inputs.ENV_NAME }}
-      IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+      AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
     steps:
       - name: Login to Azure (OIDC)
         uses: azure/login@v2
diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
index 6cfa7f910..a0bb3258a 100644
--- a/.github/workflows/job-deploy-linux.yml
+++ b/.github/workflows/job-deploy-linux.yml
@@ -6,7 +6,7 @@ on:
       ENV_NAME:
         required: true
         type: string
-      AZURE_ENV_OPENAI_LOCATION:
+      AZURE_ENV_AI_SERVICE_LOCATION:
         required: true
         type: string
       AZURE_LOCATION:
@@ -15,7 +15,7 @@ on:
       RESOURCE_GROUP_NAME:
         required: true
         type: string
-      IMAGE_TAG:
+      AZURE_ENV_IMAGE_TAG:
         required: true
         type: string
       BUILD_DOCKER_IMAGE:
@@ -28,10 +28,10 @@ on:
         required: false
         type: string
         default: 'false'
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
         required: false
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_ENV_FOUNDRY_PROJECT_RID:
         required: false
         type: string
     outputs:
@@ -52,15 +52,15 @@ jobs:
         shell: bash
         env:
           INPUT_ENV_NAME: ${{ inputs.ENV_NAME }}
-          INPUT_AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
+          INPUT_AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
           INPUT_AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
-          INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          INPUT_AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           INPUT_EXP: ${{ inputs.EXP }}
           INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
         run: |
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=false
@@ -76,15 +76,15 @@ jobs:
             echo "✅ ENV_NAME: '$INPUT_ENV_NAME' is valid"
           fi
           
-          # Validate AZURE_ENV_OPENAI_LOCATION (required, Azure region format)
-          if [[ -z "$INPUT_AZURE_ENV_OPENAI_LOCATION" ]]; then
-            echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION is required but not provided"
+          # Validate AZURE_ENV_AI_SERVICE_LOCATION (required, Azure region format)
+          if [[ -z "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" ]]; then
+            echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION is required but not provided"
             VALIDATION_FAILED=true
-          elif [[ ! "$INPUT_AZURE_ENV_OPENAI_LOCATION" =~ ^[a-z0-9]+$ ]]; then
-            echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION '$INPUT_AZURE_ENV_OPENAI_LOCATION' is invalid. Must contain only lowercase letters and numbers"
+          elif [[ ! "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" =~ ^[a-z0-9]+$ ]]; then
+            echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is invalid. Must contain only lowercase letters and numbers"
             VALIDATION_FAILED=true
           else
-            echo "✅ AZURE_ENV_OPENAI_LOCATION: '$INPUT_AZURE_ENV_OPENAI_LOCATION' is valid"
+            echo "✅ AZURE_ENV_AI_SERVICE_LOCATION: '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is valid"
           fi
           
           # Validate AZURE_LOCATION (required, Azure region format)
@@ -112,15 +112,15 @@ jobs:
             echo "✅ RESOURCE_GROUP_NAME: '$INPUT_RESOURCE_GROUP_NAME' is valid"
           fi
           
-          # Validate IMAGE_TAG (required, Docker tag pattern)
-          if [[ -z "$INPUT_IMAGE_TAG" ]]; then
-            echo "❌ ERROR: IMAGE_TAG is required but not provided"
+          # Validate AZURE_ENV_IMAGE_TAG (required, Docker tag pattern)
+          if [[ -z "$INPUT_AZURE_ENV_IMAGE_TAG" ]]; then
+            echo "❌ ERROR: AZURE_ENV_IMAGE_TAG is required but not provided"
             VALIDATION_FAILED=true
-          elif [[ ! "$INPUT_IMAGE_TAG" =~ ^[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}$ ]]; then
-            echo "❌ ERROR: IMAGE_TAG '$INPUT_IMAGE_TAG' is invalid. Must start with alphanumeric or underscore, max 128 characters"
+          elif [[ ! "$INPUT_AZURE_ENV_IMAGE_TAG" =~ ^[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}$ ]]; then
+            echo "❌ ERROR: AZURE_ENV_IMAGE_TAG '$INPUT_AZURE_ENV_IMAGE_TAG' is invalid. Must start with alphanumeric or underscore, max 128 characters"
             VALIDATION_FAILED=true
           else
-            echo "✅ IMAGE_TAG: '$INPUT_IMAGE_TAG' is valid"
+            echo "✅ AZURE_ENV_IMAGE_TAG: '$INPUT_AZURE_ENV_IMAGE_TAG' is valid"
           fi
           
           # Validate BUILD_DOCKER_IMAGE (required, must be 'true' or 'false')
@@ -147,27 +147,27 @@ jobs:
             echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
           fi
           
-          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, if provided must be valid Resource ID)
-          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
-              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
-              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
             fi
           fi
           
-          # Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
-          if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
-              echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
-              echo "   Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
             fi
           fi
           
@@ -215,14 +215,14 @@ jobs:
         shell: bash
         env:
           ENV_NAME: ${{ inputs.ENV_NAME }}
-          AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
           AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
           RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
-          IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           EXP: ${{ inputs.EXP }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
         run: |
           set -e
 
@@ -235,17 +235,17 @@ jobs:
           
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          azd env set AZURE_ENV_OPENAI_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
+          azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_AI_SERVICE_LOCATION"
           azd env set AZURE_LOCATION="$AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
-          azd env set IMAGE_TAG="$IMAGE_TAG"
+          azd env set AZURE_ENV_IMAGE_TAG="$AZURE_ENV_IMAGE_TAG"
           
           # Set ACR name only when building Docker image
           if [[ "$BUILD_DOCKER_IMAGE" == "true" ]]; then
             # Extract ACR name from login server and set as environment variable
-            ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
-            azd env set ACR_NAME="$ACR_NAME"
-            echo "Set ACR name to: $ACR_NAME"
+            AZURE_ENV_CONTAINER_REGISTRY_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
+            azd env set AZURE_ENV_CONTAINER_REGISTRY_NAME="$AZURE_ENV_CONTAINER_REGISTRY_NAME"
+            echo "Set ACR name to: $AZURE_ENV_CONTAINER_REGISTRY_NAME"
           else
             echo "Skipping ACR name configuration (using existing image)"
           fi
@@ -254,25 +254,25 @@ jobs:
             echo "✅ EXP ENABLED - Setting EXP parameters..."
             
             # Set EXP variables dynamically
-            if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
-              EXP_LOG_ANALYTICS_ID="$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID"
+            if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+              EXP_LOG_ANALYTICS_ID="$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID"
             else
-              EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
+              EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}"
             fi
             
-            if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
-              EXP_AI_PROJECT_ID="$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID"
+            if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
+              EXP_AI_PROJECT_ID="$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID"
             else
-              EXP_AI_PROJECT_ID="${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
+              EXP_AI_PROJECT_ID="${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}"
             fi
             
-            echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID"
-            echo "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
-            azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="$EXP_LOG_ANALYTICS_ID"
-            azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
+            echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
+            echo "AZURE_ENV_FOUNDRY_PROJECT_RID: $EXP_AI_PROJECT_ID"
+            azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
+            azd env set AZURE_ENV_FOUNDRY_PROJECT_RID="$EXP_AI_PROJECT_ID"
           else
             echo "❌ EXP DISABLED - Skipping EXP parameters"
-            if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]] || [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
+            if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]] || [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
               echo "⚠️  Warning: EXP parameter values provided but EXP is disabled. These values will be ignored."
             fi
           fi
@@ -292,8 +292,8 @@ jobs:
           WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
           EXP: ${{ inputs.EXP }}
           AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
-          AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
-          IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
+          AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           JOB_STATUS: ${{ job.status }}
           WEB_APP_URL: ${{ steps.get_output_linux.outputs.WEB_APP_URL }}
         run: |
@@ -323,8 +323,8 @@ jobs:
           echo "| **Configuration Type** | \`$CONFIG_TYPE\` |" >> $GITHUB_STEP_SUMMARY
           
           echo "| **Azure Region (Infrastructure)** | \`$AZURE_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Azure OpenAI Region** | \`$AZURE_ENV_OPENAI_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Docker Image Tag** | \`$IMAGE_TAG\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Azure OpenAI Region** | \`$AZURE_ENV_AI_SERVICE_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Docker Image Tag** | \`$AZURE_ENV_IMAGE_TAG\` |" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           
           if [[ "$JOB_STATUS" == "success" ]]; then
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
index ed8cf5a8a..e42320bb7 100644
--- a/.github/workflows/job-deploy-windows.yml
+++ b/.github/workflows/job-deploy-windows.yml
@@ -6,7 +6,7 @@ on:
       ENV_NAME:
         required: true
         type: string
-      AZURE_ENV_OPENAI_LOCATION:
+      AZURE_ENV_AI_SERVICE_LOCATION:
         required: true
         type: string
       AZURE_LOCATION:
@@ -15,7 +15,7 @@ on:
       RESOURCE_GROUP_NAME:
         required: true
         type: string
-      IMAGE_TAG:
+      AZURE_ENV_IMAGE_TAG:
         required: true
         type: string
       BUILD_DOCKER_IMAGE:
@@ -28,10 +28,10 @@ on:
         required: false
         type: string
         default: 'false'
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
         required: false
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_ENV_FOUNDRY_PROJECT_RID:
         required: false
         type: string
     outputs:
@@ -53,15 +53,15 @@ jobs:
         shell: bash
         env:
           INPUT_ENV_NAME: ${{ inputs.ENV_NAME }}
-          INPUT_AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
+          INPUT_AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
           INPUT_AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
-          INPUT_IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          INPUT_AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           INPUT_EXP: ${{ inputs.EXP }}
           INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
         run: |
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=false
@@ -77,15 +77,15 @@ jobs:
             echo "✅ ENV_NAME: '$INPUT_ENV_NAME' is valid"
           fi
           
-          # Validate AZURE_ENV_OPENAI_LOCATION (required, Azure region format)
-          if [[ -z "$INPUT_AZURE_ENV_OPENAI_LOCATION" ]]; then
-            echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION is required but not provided"
+          # Validate AZURE_ENV_AI_SERVICE_LOCATION (required, Azure region format)
+          if [[ -z "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" ]]; then
+            echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION is required but not provided"
             VALIDATION_FAILED=true
-          elif [[ ! "$INPUT_AZURE_ENV_OPENAI_LOCATION" =~ ^[a-z0-9]+$ ]]; then
-            echo "❌ ERROR: AZURE_ENV_OPENAI_LOCATION '$INPUT_AZURE_ENV_OPENAI_LOCATION' is invalid. Must contain only lowercase letters and numbers"
+          elif [[ ! "$INPUT_AZURE_ENV_AI_SERVICE_LOCATION" =~ ^[a-z0-9]+$ ]]; then
+            echo "❌ ERROR: AZURE_ENV_AI_SERVICE_LOCATION '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is invalid. Must contain only lowercase letters and numbers"
             VALIDATION_FAILED=true
           else
-            echo "✅ AZURE_ENV_OPENAI_LOCATION: '$INPUT_AZURE_ENV_OPENAI_LOCATION' is valid"
+            echo "✅ AZURE_ENV_AI_SERVICE_LOCATION: '$INPUT_AZURE_ENV_AI_SERVICE_LOCATION' is valid"
           fi
           
           # Validate AZURE_LOCATION (required, Azure region format)
@@ -113,15 +113,15 @@ jobs:
             echo "✅ RESOURCE_GROUP_NAME: '$INPUT_RESOURCE_GROUP_NAME' is valid"
           fi
           
-          # Validate IMAGE_TAG (required, Docker tag pattern)
-          if [[ -z "$INPUT_IMAGE_TAG" ]]; then
-            echo "❌ ERROR: IMAGE_TAG is required but not provided"
+          # Validate AZURE_ENV_IMAGE_TAG (required, Docker tag pattern)
+          if [[ -z "$INPUT_AZURE_ENV_IMAGE_TAG" ]]; then
+            echo "❌ ERROR: AZURE_ENV_IMAGE_TAG is required but not provided"
             VALIDATION_FAILED=true
-          elif [[ ! "$INPUT_IMAGE_TAG" =~ ^[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}$ ]]; then
-            echo "❌ ERROR: IMAGE_TAG '$INPUT_IMAGE_TAG' is invalid. Must start with alphanumeric or underscore, max 128 characters"
+          elif [[ ! "$INPUT_AZURE_ENV_IMAGE_TAG" =~ ^[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}$ ]]; then
+            echo "❌ ERROR: AZURE_ENV_IMAGE_TAG '$INPUT_AZURE_ENV_IMAGE_TAG' is invalid. Must start with alphanumeric or underscore, max 128 characters"
             VALIDATION_FAILED=true
           else
-            echo "✅ IMAGE_TAG: '$INPUT_IMAGE_TAG' is valid"
+            echo "✅ AZURE_ENV_IMAGE_TAG: '$INPUT_AZURE_ENV_IMAGE_TAG' is valid"
           fi
           
           # Validate BUILD_DOCKER_IMAGE (required, must be 'true' or 'false')
@@ -148,27 +148,27 @@ jobs:
             echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
           fi
           
-          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, if provided must be valid Resource ID)
-          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
-              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
-              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
             fi
           fi
           
-          # Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
-          if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
-              echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_FOUNDRY_PROJECT_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
-              echo "   Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
             fi
           fi
           
@@ -218,14 +218,14 @@ jobs:
         shell: pwsh
         env:
           ENV_NAME: ${{ inputs.ENV_NAME }}
-          AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
           AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
           RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
-          IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           EXP: ${{ inputs.EXP }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
         run: |
           $ErrorActionPreference = "Stop"
 
@@ -238,17 +238,17 @@ jobs:
         
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          azd env set AZURE_ENV_OPENAI_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
+          azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:AZURE_ENV_AI_SERVICE_LOCATION"
           azd env set AZURE_LOCATION="$env:AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"
-          azd env set IMAGE_TAG="$env:IMAGE_TAG"
+          azd env set AZURE_ENV_IMAGE_TAG="$env:AZURE_ENV_IMAGE_TAG"
           
           # Set ACR name only when building Docker image
           if ($env:BUILD_DOCKER_IMAGE -eq "true") {
             # Extract ACR name from login server (e.g., myacr.azurecr.io -> myacr)
-            $ACR_NAME = ("${{ secrets.ACR_TEST_LOGIN_SERVER }}").Split('.')[0]
-            azd env set ACR_NAME="$ACR_NAME"
-            Write-Host "Set ACR name to: $ACR_NAME"
+            $AZURE_ENV_CONTAINER_REGISTRY_NAME = ("${{ secrets.ACR_TEST_LOGIN_SERVER }}").Split('.')[0]
+            azd env set AZURE_ENV_CONTAINER_REGISTRY_NAME="$AZURE_ENV_CONTAINER_REGISTRY_NAME"
+            Write-Host "Set ACR name to: $AZURE_ENV_CONTAINER_REGISTRY_NAME"
           } else {
             Write-Host "Skipping ACR name configuration (using existing image)"
           }
@@ -257,22 +257,22 @@ jobs:
             Write-Host "✅ EXP ENABLED - Setting EXP parameters..."
             
             # Set EXP variables dynamically
-            if ($env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID -ne "") {
-              $EXP_LOG_ANALYTICS_ID = $env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID
+            if ($env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID -ne "") {
+              $EXP_LOG_ANALYTICS_ID = $env:INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID
             } else {
-              $EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
+              $EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}"
             }
             
-            if ($env:INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID -ne "") {
-              $EXP_AI_PROJECT_ID = $env:INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID
+            if ($env:INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID -ne "") {
+              $EXP_AI_PROJECT_ID = $env:INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID
             } else {
-              $EXP_AI_PROJECT_ID = "${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
+              $EXP_AI_PROJECT_ID = "${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}"
             }
             
-            Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID"
-            Write-Host "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
-            azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="$EXP_LOG_ANALYTICS_ID"
-            azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
+            Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
+            Write-Host "AZURE_ENV_FOUNDRY_PROJECT_RID: $EXP_AI_PROJECT_ID"
+            azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
+            azd env set AZURE_ENV_FOUNDRY_PROJECT_RID="$EXP_AI_PROJECT_ID"
           } else {
             Write-Host "❌ EXP DISABLED - Skipping EXP parameters"
           }
@@ -296,8 +296,8 @@ jobs:
           WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
           EXP: ${{ inputs.EXP }}
           AZURE_LOCATION: ${{ inputs.AZURE_LOCATION }}
-          AZURE_ENV_OPENAI_LOCATION: ${{ inputs.AZURE_ENV_OPENAI_LOCATION }}
-          IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ inputs.AZURE_ENV_AI_SERVICE_LOCATION }}
+          AZURE_ENV_IMAGE_TAG: ${{ inputs.AZURE_ENV_IMAGE_TAG }}
           JOB_STATUS: ${{ job.status }}
           WEB_APPURL: ${{ steps.get_output_windows.outputs.WEB_APPURL }}
         run: |
@@ -325,8 +325,8 @@ jobs:
           echo "| **Configuration Type** | \`$CONFIG_TYPE\` |" >> $GITHUB_STEP_SUMMARY
           
           echo "| **Azure Region (Infrastructure)** | \`$AZURE_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Azure OpenAI Region** | \`$AZURE_ENV_OPENAI_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Docker Image Tag** | \`$IMAGE_TAG\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Azure OpenAI Region** | \`$AZURE_ENV_AI_SERVICE_LOCATION\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Docker Image Tag** | \`$AZURE_ENV_IMAGE_TAG\` |" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           if [[ "$JOB_STATUS" == "success" ]]; then
             echo "### ✅ Deployment Details" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/job-deploy.yml b/.github/workflows/job-deploy.yml
index 429aca483..37f771d19 100644
--- a/.github/workflows/job-deploy.yml
+++ b/.github/workflows/job-deploy.yml
@@ -51,12 +51,12 @@ on:
         required: false
         default: ''
         type: string
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_ENV_FOUNDRY_PROJECT_RID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -66,7 +66,7 @@ on:
         required: false
         default: ''
         type: string
-      image_model_choice:
+      AZURE_ENV_IMAGE_MODEL_NAME:
         description: 'Image model to deploy (gpt-image-1-mini, gpt-image-1.5, none)'
         required: false
         default: 'gpt-image-1-mini'
@@ -84,12 +84,12 @@ on:
       AZURE_LOCATION:
         description: "Azure Location"
         value: ${{ jobs.azure-setup.outputs.AZURE_LOCATION }}
-      AZURE_ENV_OPENAI_LOCATION:
+      AZURE_ENV_AI_SERVICE_LOCATION:
         description: "Azure OpenAI Location"
-        value: ${{ jobs.azure-setup.outputs.AZURE_ENV_OPENAI_LOCATION }}
-      IMAGE_TAG:
+        value: ${{ jobs.azure-setup.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
+      AZURE_ENV_IMAGE_TAG:
         description: "Docker Image Tag Used"
-        value: ${{ jobs.azure-setup.outputs.IMAGE_TAG }}
+        value: ${{ jobs.azure-setup.outputs.AZURE_ENV_IMAGE_TAG }}
       QUOTA_FAILED:
         description: "Quota Check Failed Flag"
         value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED || 'false' }}
@@ -103,6 +103,7 @@ env:
   CLEANUP_RESOURCES: ${{ inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources }}
   RUN_E2E_TESTS: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.run_e2e_tests || 'GoldenPath-Testing') || 'GoldenPath-Testing' }}
   BUILD_DOCKER_IMAGE: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.build_docker_image || false) || false }}
+  RG_TAGS: ${{ vars.RG_TAGS }}
 
 jobs:
   azure-setup:
@@ -114,8 +115,8 @@ jobs:
       RESOURCE_GROUP_NAME: ${{ steps.check_create_rg.outputs.RESOURCE_GROUP_NAME }}
       ENV_NAME: ${{ steps.generate_env_name.outputs.ENV_NAME }}
       AZURE_LOCATION: ${{ steps.set_region.outputs.AZURE_LOCATION }}
-      AZURE_ENV_OPENAI_LOCATION: ${{ steps.set_region.outputs.AZURE_ENV_OPENAI_LOCATION }}
-      IMAGE_TAG: ${{ steps.determine_image_tag.outputs.IMAGE_TAG }}
+      AZURE_ENV_AI_SERVICE_LOCATION: ${{ steps.set_region.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
+      AZURE_ENV_IMAGE_TAG: ${{ steps.determine_image_tag.outputs.AZURE_ENV_IMAGE_TAG }}
       QUOTA_FAILED: ${{ steps.quota_failure_output.outputs.QUOTA_FAILED }}
       EXP_ENABLED: ${{ steps.configure_exp.outputs.EXP_ENABLED }}
 
@@ -132,8 +133,8 @@ jobs:
           INPUT_EXP: ${{ inputs.EXP }}
           INPUT_CLEANUP_RESOURCES: ${{ inputs.cleanup_resources }}
           INPUT_RUN_E2E_TESTS: ${{ inputs.run_e2e_tests }}
-          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
           INPUT_EXISTING_WEBAPP_URL: ${{ inputs.existing_webapp_url }}
           INPUT_DOCKER_IMAGE_TAG: ${{ inputs.docker_image_tag }}
         run: |
@@ -229,27 +230,27 @@ jobs:
             fi
           fi
           
-          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (Azure Resource ID format)
-          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
-              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
-              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
             fi
           fi
           
-          # Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (Azure Resource ID format)
-          if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
-            if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
-              echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
+          # Validate AZURE_ENV_FOUNDRY_PROJECT_RID (Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
+              echo "❌ ERROR: AZURE_ENV_FOUNDRY_PROJECT_RID is invalid. Must be a valid Azure Resource ID format:"
               echo "   /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
-              echo "   Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
+              echo "   Got: '$INPUT_AZURE_ENV_FOUNDRY_PROJECT_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_FOUNDRY_PROJECT_RID: Valid Resource ID format"
             fi
           fi
           
@@ -293,8 +294,8 @@ jobs:
         shell: bash
         env:
           INPUT_EXP: ${{ inputs.EXP }}
-          INPUT_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          INPUT_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          INPUT_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
         run: |
           echo "🔍 Validating EXP configuration..."
           
@@ -334,7 +335,7 @@ jobs:
         env:
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
-          IMAGE_MODEL_CHOICE: ${{ inputs.image_model_choice || 'gpt-image-1-mini' }}
+          AZURE_ENV_IMAGE_MODEL_NAME: ${{ inputs.AZURE_ENV_IMAGE_MODEL_NAME || 'gpt-image-1-mini' }}
           IMAGE_MODEL_MIN_CAPACITY: ${{ env.IMAGE_MODEL_MIN_CAPACITY }}
           AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
         run: |
@@ -478,8 +479,8 @@ jobs:
         run: |
           echo "Selected Region from OpenAI Quota Check: $VALID_REGION"
           echo "Selected Region from Search Quota Check: $SEARCH_VALID_REGION"
-          echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_ENV
-          echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_OUTPUT
+          echo "AZURE_ENV_AI_SERVICE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
+          echo "AZURE_ENV_AI_SERVICE_LOCATION=$VALID_REGION" >> $GITHUB_OUTPUT
 
           if [[ "${{ inputs.trigger_type }}" == "workflow_dispatch" && -n "$INPUT_AZURE_LOCATION" ]]; then
             # Manual trigger: use user's region if it passed search quota, otherwise use search-validated region
@@ -532,7 +533,7 @@ jobs:
           rg_exists=$(az group exists --name $RESOURCE_GROUP_NAME)
           if [ "$rg_exists" = "false" ]; then
             echo "📦 Resource group does not exist. Creating new resource group '$RESOURCE_GROUP_NAME' in location '$AZURE_LOCATION'..."
-            az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION || { echo "❌ Error creating resource group"; exit 1; }
+            az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION --tags ${{ env.RG_TAGS }} || { echo "❌ Error creating resource group"; exit 1; }
             echo "✅ Resource group '$RESOURCE_GROUP_NAME' created successfully."
           else
             echo "✅ Resource group '$RESOURCE_GROUP_NAME' already exists. Deploying to existing resource group."
@@ -559,8 +560,8 @@ jobs:
         run: |
           if [[ "${{ env.BUILD_DOCKER_IMAGE }}" == "true" ]]; then
             if [[ -n "$INPUT_DOCKER_IMAGE_TAG" ]]; then
-              IMAGE_TAG="$INPUT_DOCKER_IMAGE_TAG"
-              echo "🔗 Using Docker image tag from build job: $IMAGE_TAG"
+              AZURE_ENV_IMAGE_TAG="$INPUT_DOCKER_IMAGE_TAG"
+              echo "🔗 Using Docker image tag from build job: $AZURE_ENV_IMAGE_TAG"
             else
               echo "❌ Docker build job failed or was skipped, but BUILD_DOCKER_IMAGE is true"
               exit 1
@@ -572,24 +573,24 @@ jobs:
             
             # Determine image tag based on branch
             if [[ "$BRANCH_NAME" == "main" ]]; then
-              IMAGE_TAG="latest"
+              AZURE_ENV_IMAGE_TAG="latest"
               echo "Using main branch - image tag: latest"
             elif [[ "$BRANCH_NAME" == "dev" ]]; then
-              IMAGE_TAG="dev"
+              AZURE_ENV_IMAGE_TAG="dev"
               echo "Using dev branch - image tag: dev"
             elif [[ "$BRANCH_NAME" == "demo" ]]; then
-              IMAGE_TAG="demo"
+              AZURE_ENV_IMAGE_TAG="demo"
               echo "Using demo branch - image tag: demo"
             else
-              IMAGE_TAG="latest"
+              AZURE_ENV_IMAGE_TAG="latest"
               echo "Using default for branch '$BRANCH_NAME' - image tag: latest"
             fi
             
-            echo "Using existing Docker image tag: $IMAGE_TAG"
+            echo "Using existing Docker image tag: $AZURE_ENV_IMAGE_TAG"
           fi
           
-          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
-          echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "AZURE_ENV_IMAGE_TAG=$AZURE_ENV_IMAGE_TAG" >> $GITHUB_ENV
+          echo "AZURE_ENV_IMAGE_TAG=$AZURE_ENV_IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Generate Unique Environment Name
         id: generate_env_name
@@ -645,15 +646,15 @@ jobs:
     uses: ./.github/workflows/job-deploy-linux.yml
     with:
       ENV_NAME: ${{ needs.azure-setup.outputs.ENV_NAME }}
-      AZURE_ENV_OPENAI_LOCATION: ${{ needs.azure-setup.outputs.AZURE_ENV_OPENAI_LOCATION }}
+      AZURE_ENV_AI_SERVICE_LOCATION: ${{ needs.azure-setup.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
       AZURE_LOCATION: ${{ needs.azure-setup.outputs.AZURE_LOCATION }}
       RESOURCE_GROUP_NAME: ${{ needs.azure-setup.outputs.RESOURCE_GROUP_NAME }}
-      IMAGE_TAG: ${{ needs.azure-setup.outputs.IMAGE_TAG }}
+      AZURE_ENV_IMAGE_TAG: ${{ needs.azure-setup.outputs.AZURE_ENV_IMAGE_TAG }}
       BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
       EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
       WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
     secrets: inherit
 
   deploy-windows:
@@ -663,13 +664,13 @@ jobs:
     uses: ./.github/workflows/job-deploy-windows.yml
     with:
       ENV_NAME: ${{ needs.azure-setup.outputs.ENV_NAME }}
-      AZURE_ENV_OPENAI_LOCATION: ${{ needs.azure-setup.outputs.AZURE_ENV_OPENAI_LOCATION }}
+      AZURE_ENV_AI_SERVICE_LOCATION: ${{ needs.azure-setup.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
       AZURE_LOCATION: ${{ needs.azure-setup.outputs.AZURE_LOCATION }}
       RESOURCE_GROUP_NAME: ${{ needs.azure-setup.outputs.RESOURCE_GROUP_NAME }}
-      IMAGE_TAG: ${{ needs.azure-setup.outputs.IMAGE_TAG }}
+      AZURE_ENV_IMAGE_TAG: ${{ needs.azure-setup.outputs.AZURE_ENV_IMAGE_TAG }}
       BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
       EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
       WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_ENV_FOUNDRY_PROJECT_RID: ${{ inputs.AZURE_ENV_FOUNDRY_PROJECT_RID }}
     secrets: inherit
diff --git a/.github/workflows/job-docker-build.yml b/.github/workflows/job-docker-build.yml
index 3773ea285..48266fab7 100644
--- a/.github/workflows/job-docker-build.yml
+++ b/.github/workflows/job-docker-build.yml
@@ -13,9 +13,9 @@ on:
         default: false
         type: boolean
     outputs:
-      IMAGE_TAG:
+      AZURE_ENV_IMAGE_TAG:
         description: "Generated Docker Image Tag"
-        value: ${{ jobs.docker-build.outputs.IMAGE_TAG }}
+        value: ${{ jobs.docker-build.outputs.AZURE_ENV_IMAGE_TAG }}
 
 env:
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: production
     outputs:
-      IMAGE_TAG: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
+      AZURE_ENV_IMAGE_TAG: ${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
@@ -41,8 +41,8 @@ jobs:
           BRANCH_NAME="${{ github.head_ref || github.ref_name }}"
           CLEAN_BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9._-]/-/g' | sed 's/--*/-/g' | sed 's/^-\|-$//g')
           UNIQUE_TAG="${CLEAN_BRANCH_NAME}-${TIMESTAMP}-${RUN_ID}"
-          echo "IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_ENV
-          echo "IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_OUTPUT
+          echo "AZURE_ENV_IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_ENV
+          echo "AZURE_ENV_IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_OUTPUT
           echo "Generated unique Docker tag: $UNIQUE_TAG"
 
       - name: Set up Docker Buildx
@@ -69,8 +69,8 @@ jobs:
           file: ./src/app/WebApp.Dockerfile
           push: true
           tags: |
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
+            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
+            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
 
       - name: Build and Push Docker Image for Backend Server
         id: build_push_backend
@@ -82,26 +82,26 @@ jobs:
           file: ./src/backend/ApiApp.Dockerfile
           push: true
           tags: |
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
+            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
+            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
 
       - name: Verify Docker Image Build
         shell: bash
         run: |
           echo "✅ Docker images successfully built and pushed"
-          echo "Image tag: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}"
+          echo "Image tag: ${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}"
       
       - name: Generate Docker Build Summary
         if: always()
         shell: bash
         run: |
-          ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
+          AZURE_ENV_CONTAINER_REGISTRY_SERVER=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
           echo "## 🐳 Docker Build Job Summary" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
           echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
           echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Image Tag** | \`${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Image Tag** | \`${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
           echo "| **Branch** | ${{ env.BRANCH_NAME }} |" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           if [[ "${{ job.status }}" == "success" ]]; then
@@ -109,8 +109,8 @@ jobs:
             echo "Successfully built and pushed Docker images to ACR:" >> $GITHUB_STEP_SUMMARY
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "**Built Images:**" >> $GITHUB_STEP_SUMMARY
-            echo "- \`${ACR_NAME}/content-gen-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`${ACR_NAME}/content-gen-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`${AZURE_ENV_CONTAINER_REGISTRY_SERVER}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`${AZURE_ENV_CONTAINER_REGISTRY_SERVER}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
           else
             echo "### ❌ Build Failed" >> $GITHUB_STEP_SUMMARY
             echo "- Docker build process encountered an error" >> $GITHUB_STEP_SUMMARY
diff --git a/azure.yaml b/azure.yaml
index 1898b4e37..252e186b8 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -66,7 +66,7 @@ hooks:
         Write-Host "AI Search Index: " -NoNewline
         Write-Host "$env:AZURE_AI_SEARCH_PRODUCTS_INDEX" -ForegroundColor Cyan
         Write-Host "AI Service Location: " -NoNewline
-        Write-Host "$env:AZURE_ENV_OPENAI_LOCATION" -ForegroundColor Cyan
+        Write-Host "$env:AZURE_ENV_AI_SERVICE_LOCATION" -ForegroundColor Cyan
         Write-Host "Container Instance: " -NoNewline
         Write-Host "$env:CONTAINER_INSTANCE_NAME" -ForegroundColor Cyan     
         
@@ -112,11 +112,11 @@ hooks:
         echo "Storage Account: $AZURE_BLOB_ACCOUNT_NAME"
         echo "AI Search Service: $AI_SEARCH_SERVICE_NAME"
         echo "AI Search Index: $AZURE_AI_SEARCH_PRODUCTS_INDEX"
-        echo "AI Service Location: $AZURE_ENV_OPENAI_LOCATION"
+        echo "AI Service Location: $AZURE_ENV_AI_SERVICE_LOCATION"
         echo "Container Instance: $CONTAINER_INSTANCE_NAME"
         
         echo ""
-        echo "Container Registry: $ACR_NAME"
+        echo "Container Registry: $AZURE_ENV_CONTAINER_REGISTRY_NAME"
         
         # Run post-deploy script to upload sample data and create search index
         echo ""
diff --git a/docs/AZD_DEPLOYMENT.md b/docs/AZD_DEPLOYMENT.md
index 942fba86f..42f6a984d 100644
--- a/docs/AZD_DEPLOYMENT.md
+++ b/docs/AZD_DEPLOYMENT.md
@@ -124,14 +124,14 @@ This single command will:
 
 ```bash
 # Set the resource ID of your existing AI Project
-azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID "/subscriptions/<sub-id>/resourceGroups/<rg>/providers/Microsoft.MachineLearningServices/workspaces/<project-name>"
+azd env set AZURE_ENV_FOUNDRY_PROJECT_RID "/subscriptions/<sub-id>/resourceGroups/<rg>/providers/Microsoft.MachineLearningServices/workspaces/<project-name>"
 ```
 
 ### Reuse Existing Log Analytics Workspace
 
 ```bash
 # Set the resource ID of your existing Log Analytics workspace
-azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID "/subscriptions/<sub-id>/resourceGroups/<rg>/providers/Microsoft.OperationalInsights/workspaces/<workspace-name>"
+azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID "/subscriptions/<sub-id>/resourceGroups/<rg>/providers/Microsoft.OperationalInsights/workspaces/<workspace-name>"
 ```
 
 ## Post-Deployment
@@ -227,7 +227,7 @@ Error: The model 'gpt-4o' is not available in region 'westeurope'
 
 **Solution**: Set a different region for AI Services:
 ```bash
-azd env set AZURE_ENV_OPENAI_LOCATION eastus
+azd env set AZURE_ENV_AI_SERVICE_LOCATION eastus
 ```
 
 #### 3. Container Build Fails
diff --git a/docs/CustomizingAzdParameters.md b/docs/CustomizingAzdParameters.md
index e3c6bb117..5c07e063b 100644
--- a/docs/CustomizingAzdParameters.md
+++ b/docs/CustomizingAzdParameters.md
@@ -10,19 +10,19 @@ By default this template will use the environment name as the prefix to prevent
 | -------------------------------------- | ------- | ---------------------------- | ----------------------------------------------------------------------------- |
 | `AZURE_LOCATION`                       | string  | `<User selects during deployment>` | Sets the Azure region for resource deployment. Allowed: `australiaeast`, `centralus`, `eastasia`, `eastus`, `eastus2`, `japaneast`, `northeurope`, `southeastasia`, `swedencentral`, `uksouth`, `westus`, `westus3`. |
 | `AZURE_ENV_NAME`                       | string  | `contentgen`               | Sets the environment name prefix for all Azure resources (3-15 characters).   |
-| `SECONDARY_LOCATION`                   | string  | `uksouth`                  | Specifies a secondary Azure region for database creation.                     |
-| `AZURE_OPENAI_GPT_MODEL`              | string  | `gpt-5.1`                 | Specifies the GPT model name to deploy.                                       |
-| `GPT_MODEL_VERSION`                    | string  | `2025-11-13`               | Sets the GPT model version.                                                   |
-| `GPT_MODEL_DEPLOYMENT_TYPE`            | string  | `GlobalStandard`           | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`).    |
-| `GPT_MODEL_CAPACITY`                   | integer | `150`                      | Sets the GPT model token capacity (minimum: `10`).                            |
-| `AZURE_OPENAI_IMAGE_MODEL`             | string  | `gpt-image-1-mini`         | Image model to deploy (allowed: `gpt-image-1-mini`, `gpt-image-1.5`, `none`). |
-| `IMAGE_MODEL_CAPACITY`                 | integer | `1`                        | Sets the image model deployment capacity in RPM (minimum: `1`).               |
-| `AZURE_OPENAI_API_VERSION`             | string  | `2025-01-01-preview`       | Specifies the API version for Azure OpenAI service.                           |
-| `AZURE_ENV_OPENAI_LOCATION`           | string  | `<User selects during deployment>` | Sets the Azure region for OpenAI resource deployment.                         |
-| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string  | `""`                       | Reuses an existing Log Analytics Workspace instead of creating a new one.     |
-| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID`| string  | `""`                       | Reuses an existing AI Foundry Project instead of creating a new one.          |
-| `ACR_NAME`                             | string  | `contentgencontainerreg`   | Sets the existing Azure Container Registry name (without `.azurecr.io`).      |
-| `IMAGE_TAG`                            | string  | `latest`                   | Sets the container image tag (e.g., `latest`, `dev`, `hotfix`).               |
+| `AZURE_ENV_SECONDARY_LOCATION`                   | string  | `uksouth`                  | Specifies a secondary Azure region for database creation.                     |
+| `AZURE_ENV_GPT_MODEL_NAME`              | string  | `gpt-5.1`                 | Specifies the GPT model name to deploy.                                       |
+| `AZURE_ENV_GPT_MODEL_VERSION`                    | string  | `2025-11-13`               | Sets the GPT model version.                                                   |
+| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE`            | string  | `GlobalStandard`           | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`).    |
+| `AZURE_ENV_GPT_MODEL_CAPACITY`                   | integer | `150`                      | Sets the GPT model token capacity (minimum: `10`).                            |
+| `AZURE_ENV_IMAGE_MODEL_NAME`           | string  | `gpt-image-1-mini`         | Image model to deploy (allowed: `gpt-image-1-mini`, `gpt-image-1.5`, `none`). |
+| `AZURE_ENV_IMAGE_MODEL_CAPACITY`       | integer | `1`                        | Sets the image model deployment capacity in RPM (minimum: `1`).               |
+| `AZURE_ENV_OPENAI_API_VERSION`            | string  | `2025-01-01-preview`       | Specifies the API version for Azure OpenAI service.                           |
+| `AZURE_ENV_AI_SERVICE_LOCATION`           | string  | `<User selects during deployment>` | Sets the Azure region for OpenAI resource deployment.                         |
+| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID`   | string  | `""`                       | Reuses an existing Log Analytics Workspace instead of creating a new one.     |
+| `AZURE_ENV_FOUNDRY_PROJECT_RID`           | string  | `""`                       | Reuses an existing AI Foundry Project instead of creating a new one.          |
+| `AZURE_ENV_CONTAINER_REGISTRY_NAME`       | string  | `contentgencontainerreg`   | Sets the existing Azure Container Registry name (without `.azurecr.io`).      |
+| `AZURE_ENV_IMAGE_TAG`                     | string  | `latest`                   | Sets the container image tag (e.g., `latest`, `dev`, `hotfix`).               |
 
 ## How to Set a Parameter
 
@@ -36,8 +36,8 @@ azd env set <PARAMETER_NAME> <VALUE>
 
 ```bash
 azd env set AZURE_LOCATION westus2
-azd env set AZURE_OPENAI_GPT_MODEL gpt-5.1
-azd env set GPT_MODEL_DEPLOYMENT_TYPE Standard
-azd env set AZURE_OPENAI_IMAGE_MODEL gpt-image-1-mini
-azd env set ACR_NAME contentgencontainerreg
+azd env set AZURE_ENV_GPT_MODEL_NAME gpt-5.1
+azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE Standard
+azd env set AZURE_ENV_IMAGE_MODEL_NAME gpt-image-1-mini
+azd env set AZURE_ENV_CONTAINER_REGISTRY_NAME contentgencontainerreg
 ```
diff --git a/docs/DEPLOYMENT.md b/docs/DEPLOYMENT.md
index 187640f92..96323c5d0 100644
--- a/docs/DEPLOYMENT.md
+++ b/docs/DEPLOYMENT.md
@@ -218,7 +218,7 @@ az webapp config set -g $RESOURCE_GROUP -n <app-name> --http20-enabled false
 
 **Solution**: 
 1. Verify GPT-Image-1-mini or GPT-Image-1.5 deployment exists in Azure OpenAI resource
-2. Check `AZURE_OPENAI_IMAGE_MODEL` and `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` environment variables
+2. Check `AZURE_ENV_IMAGE_MODEL_NAME` and `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` environment variables
 
 </details>
 
diff --git a/docs/IMAGE_GENERATION.md b/docs/IMAGE_GENERATION.md
index ed3483741..1d0f54af1 100644
--- a/docs/IMAGE_GENERATION.md
+++ b/docs/IMAGE_GENERATION.md
@@ -7,7 +7,7 @@ The accelerator supports image generation through Azure OpenAI image models:
 - `gpt-image-1-mini`
 - `gpt-image-1.5`
 
-Both models are used through `images.generate()` in the backend image agent. The selected model is controlled by `AZURE_OPENAI_IMAGE_MODEL`.
+Both models are used through `images.generate()` in the backend image agent. The selected model is controlled by `AZURE_ENV_IMAGE_MODEL_NAME`.
 
 ## Current Model Behavior
 
@@ -139,10 +139,10 @@ async def generate_marketing_image(
 ### Required Environment Variables
 
 - `AZURE_OPENAI_ENDPOINT`
-- `AZURE_OPENAI_GPT_MODEL`
-- `AZURE_OPENAI_IMAGE_MODEL` (`gpt-image-1-mini`, `gpt-image-1.5`, or `none`)
+- `AZURE_ENV_GPT_MODEL_NAME`
+- `AZURE_ENV_IMAGE_MODEL_NAME` (`gpt-image-1-mini`, `gpt-image-1.5`, or `none`)
 - `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` (optional if same as main endpoint)
-- `AZURE_OPENAI_API_VERSION`
+- `AZURE_ENV_OPENAI_API_VERSION`
 - `AZURE_OPENAI_IMAGE_API_VERSION`
 
 ### Optional Image Controls
@@ -155,7 +155,7 @@ async def generate_marketing_image(
 The backend image generator calls Azure OpenAI with:
 
 - `images.generate()`
-- `model` set from `AZURE_OPENAI_IMAGE_MODEL`
+- `model` set from `AZURE_ENV_IMAGE_MODEL_NAME`
 - prompt text assembled from brief + product + brand constraints
 - `size` and `quality` from app settings (or request overrides)
 
@@ -184,7 +184,7 @@ The backend image generator calls Azure OpenAI with:
 ### Model Availability Notes
 
 1. Deploy either `gpt-image-1-mini` or `gpt-image-1.5` based on quota and regional availability.
-2. Set `AZURE_OPENAI_IMAGE_MODEL` to the deployed model name.
+2. Set `AZURE_ENV_IMAGE_MODEL_NAME` to the deployed model name.
 3. If using a separate image endpoint, set `AZURE_OPENAI_GPT_IMAGE_ENDPOINT`.
 4. Keep `AZURE_OPENAI_IMAGE_API_VERSION` aligned with the image model API version required by your deployment.
 
diff --git a/docs/LOCAL_DEPLOYMENT.md b/docs/LOCAL_DEPLOYMENT.md
index c3abd177e..addd22410 100644
--- a/docs/LOCAL_DEPLOYMENT.md
+++ b/docs/LOCAL_DEPLOYMENT.md
@@ -147,10 +147,10 @@ Changes to source files will automatically trigger a reload.
 | Variable | Required | Description |
 |----------|----------|-------------|
 | `AZURE_OPENAI_ENDPOINT` | Yes | Azure OpenAI endpoint URL (e.g., `https://your-resource.openai.azure.com/`) |
-| `AZURE_OPENAI_GPT_MODEL` | Yes | GPT model deployment name (e.g., `gpt-4o`, `gpt-5.1`) |
-| `AZURE_OPENAI_IMAGE_MODEL` | Yes | Image generation model (`gpt-image-1-mini` or `gpt-image-1.5`) |
+| `AZURE_ENV_GPT_MODEL_NAME` | Yes | GPT model deployment name (e.g., `gpt-4o`, `gpt-5.1`) |
+| `AZURE_ENV_IMAGE_MODEL_NAME` | Yes | Image generation model (`gpt-image-1-mini` or `gpt-image-1.5`) |
 | `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` | No | Separate endpoint for gpt-image-1-mini (if different from main endpoint) |
-| `AZURE_OPENAI_API_VERSION` | Yes | API version (e.g., `2024-06-01`) |
+| `AZURE_ENV_OPENAI_API_VERSION` | Yes | API version (e.g., `2024-06-01`) |
 | `AZURE_OPENAI_TEMPERATURE` | No | Generation temperature (default: `0.7`) |
 | `AZURE_OPENAI_MAX_TOKENS` | No | Max tokens for generation (default: `2000`) |
 
@@ -228,12 +228,12 @@ Changes to source files will automatically trigger a reload.
 ```dotenv
 # Azure OpenAI
 AZURE_OPENAI_ENDPOINT=https://my-openai.openai.azure.com/
-AZURE_OPENAI_GPT_MODEL=gpt-4o
-AZURE_OPENAI_IMAGE_MODEL=gpt-image-1-mini
+AZURE_ENV_GPT_MODEL_NAME=gpt-4o
+AZURE_ENV_IMAGE_MODEL_NAME=gpt-image-1-mini
 AZURE_OPENAI_GPT_IMAGE_ENDPOINT=https://my-openai.openai.azure.com
 AZURE_OPENAI_IMAGE_SIZE=1024x1024
 AZURE_OPENAI_IMAGE_QUALITY=medium
-AZURE_OPENAI_API_VERSION=2024-06-01
+AZURE_ENV_OPENAI_API_VERSION=2024-06-01
 
 # Cosmos DB
 AZURE_COSMOS_ENDPOINT=https://my-cosmos.documents.azure.com:443/
diff --git a/docs/TECHNICAL_GUIDE.md b/docs/TECHNICAL_GUIDE.md
index ce41f325e..76c04566c 100644
--- a/docs/TECHNICAL_GUIDE.md
+++ b/docs/TECHNICAL_GUIDE.md
@@ -156,9 +156,9 @@ See `src/backend/settings.py` for all configuration options. Key settings:
 | Variable | Description |
 |----------|-------------|
 | `AZURE_OPENAI_ENDPOINT` | Azure OpenAI endpoint for GPT model |
-| `AZURE_OPENAI_GPT_MODEL` | GPT model deployment name |
+| `AZURE_ENV_GPT_MODEL_NAME` | GPT model deployment name |
 | `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` | Azure OpenAI endpoint for GPT image model (if separate) |
-| `AZURE_OPENAI_IMAGE_MODEL` | GPT image model deployment name (gpt-image-1-mini) |
+| `AZURE_ENV_IMAGE_MODEL_NAME` | GPT image model deployment name (gpt-image-1-mini) |
 | `AZURE_COSMOS_ENDPOINT` | Azure Cosmos DB endpoint |
 | `AZURE_COSMOS_DATABASE_NAME` | Cosmos DB database name |
 | `AZURE_BLOB_ACCOUNT_NAME` | Storage account name |
diff --git a/infra/main.bicep b/infra/main.bicep
index 5e1776719..9a7914447 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -860,10 +860,10 @@ module containerInstance 'modules/container-instance.bicep' = {
     environmentVariables: [
       // Azure OpenAI Settings
       { name: 'AZURE_OPENAI_ENDPOINT', value: 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' }
-      { name: 'AZURE_OPENAI_GPT_MODEL', value: gptModelName }
-      { name: 'AZURE_OPENAI_IMAGE_MODEL', value: imageModelConfig[imageModelChoice].name }
+      { name: 'AZURE_ENV_GPT_MODEL_NAME', value: gptModelName }
+      { name: 'AZURE_ENV_IMAGE_MODEL_NAME', value: imageModelConfig[imageModelChoice].name }
       { name: 'AZURE_OPENAI_GPT_IMAGE_ENDPOINT', value: imageModelChoice != 'none' ? 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' : '' }
-      { name: 'AZURE_OPENAI_API_VERSION', value: azureOpenaiAPIVersion }
+      { name: 'AZURE_ENV_OPENAI_API_VERSION', value: azureOpenaiAPIVersion }
       // Azure Cosmos DB Settings
       { name: 'AZURE_COSMOS_ENDPOINT', value: 'https://cosmos-${solutionSuffix}.documents.azure.com:443/' }
       { name: 'AZURE_COSMOS_DATABASE_NAME', value: cosmosDBDatabaseName }
@@ -935,7 +935,7 @@ output AI_FOUNDRY_RG_NAME string = aiFoundryAiServicesResourceGroupName
 output AI_FOUNDRY_RESOURCE_ID string = useExistingAiFoundryAiProject ? '' : aiFoundryAiServices!.outputs.resourceId
 
 @description('Contains existing AI project resource ID.')
-output AZURE_EXISTING_AI_PROJECT_RESOURCE_ID string = azureExistingAIProjectResourceId
+output AZURE_ENV_FOUNDRY_PROJECT_RID string = azureExistingAIProjectResourceId
 
 @description('Contains AI Search Service Endpoint URL')
 output AZURE_AI_SEARCH_ENDPOINT string = 'https://${aiSearch.outputs.name}.search.windows.net/'
@@ -953,16 +953,16 @@ output AZURE_AI_SEARCH_IMAGE_INDEX string = 'product-images'
 output AZURE_OPENAI_ENDPOINT string = 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/'
 
 @description('Contains GPT Model')
-output AZURE_OPENAI_GPT_MODEL string = gptModelName
+output AZURE_ENV_GPT_MODEL_NAME string = gptModelName
 
 @description('Contains Image Model (empty if none selected)')
-output AZURE_OPENAI_IMAGE_MODEL string = imageModelConfig[imageModelChoice].name
+output AZURE_ENV_IMAGE_MODEL_NAME string = imageModelConfig[imageModelChoice].name
 
 @description('Contains Azure OpenAI GPT/Image endpoint URL (empty if no image model selected)')
 output AZURE_OPENAI_GPT_IMAGE_ENDPOINT string = imageModelChoice != 'none' ? 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' : ''
 
 @description('Contains Azure OpenAI API Version')
-output AZURE_OPENAI_API_VERSION string = azureOpenaiAPIVersion
+output AZURE_ENV_OPENAI_API_VERSION string = azureOpenaiAPIVersion
 
 @description('Contains OpenAI Resource')
 output AZURE_OPENAI_RESOURCE string = aiFoundryAiServicesResourceName
@@ -977,7 +977,7 @@ output AZURE_AI_AGENT_API_VERSION string = azureAiAgentApiVersion
 output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = (enableMonitoring && !useExistingLogAnalytics) ? applicationInsights!.outputs.connectionString : ''
 
 @description('Contains the location used for AI Services deployment')
-output AZURE_ENV_OPENAI_LOCATION string = azureAiServiceLocation
+output AZURE_ENV_AI_SERVICE_LOCATION string = azureAiServiceLocation
 
 @description('Contains Container Instance Name')
 output CONTAINER_INSTANCE_NAME string = containerInstance.outputs.name
@@ -989,7 +989,7 @@ output CONTAINER_INSTANCE_IP string = containerInstance.outputs.ipAddress
 output CONTAINER_INSTANCE_FQDN string = enablePrivateNetworking ? '' : containerInstance.outputs.fqdn
 
 @description('Contains ACR Name')
-output ACR_NAME string = acrResourceName
+output AZURE_ENV_CONTAINER_REGISTRY_NAME string = acrResourceName
 
 @description('Contains flag for Azure AI Foundry usage')
 output USE_FOUNDRY bool = useFoundryMode ? true : false
diff --git a/infra/main.json b/infra/main.json
index 4e25c3002..c6d1c2043 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.41.2.15936",
-      "templateHash": "7762801937040004596"
+      "templateHash": "14575344972848807462"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -33079,11 +33079,11 @@
                 "value": "[format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName'))]"
               },
               {
-                "name": "AZURE_OPENAI_GPT_MODEL",
+                "name": "AZURE_ENV_GPT_MODEL_NAME",
                 "value": "[parameters('gptModelName')]"
               },
               {
-                "name": "AZURE_OPENAI_IMAGE_MODEL",
+                "name": "AZURE_ENV_IMAGE_MODEL_NAME",
                 "value": "[variables('imageModelConfig')[parameters('imageModelChoice')].name]"
               },
               {
@@ -33091,7 +33091,7 @@
                 "value": "[if(not(equals(parameters('imageModelChoice'), 'none')), format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName')), '')]"
               },
               {
-                "name": "AZURE_OPENAI_API_VERSION",
+                "name": "AZURE_ENV_OPENAI_API_VERSION",
                 "value": "[parameters('azureOpenaiAPIVersion')]"
               },
               {
@@ -33176,7 +33176,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.41.2.15936",
-              "templateHash": "4952237836308528733"
+              "templateHash": "11066122245438821615"
             }
           },
           "parameters": {
@@ -33248,9 +33248,8 @@
             },
             "userAssignedIdentityResourceId": {
               "type": "string",
-              "defaultValue": "",
               "metadata": {
-                "description": "Optional. User-assigned managed identity resource ID for ACR pull."
+                "description": "Required. User-assigned managed identity resource ID for ACR pull."
               }
             }
           },
@@ -33460,7 +33459,7 @@
       },
       "value": "[if(variables('useExistingAiFoundryAiProject'), '', reference('aiFoundryAiServices').outputs.resourceId.value)]"
     },
-    "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID": {
+    "AZURE_ENV_FOUNDRY_PROJECT_RID": {
       "type": "string",
       "metadata": {
         "description": "Contains existing AI project resource ID."
@@ -33502,14 +33501,14 @@
       },
       "value": "[format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName'))]"
     },
-    "AZURE_OPENAI_GPT_MODEL": {
+    "AZURE_ENV_GPT_MODEL_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains GPT Model"
       },
       "value": "[parameters('gptModelName')]"
     },
-    "AZURE_OPENAI_IMAGE_MODEL": {
+    "AZURE_ENV_IMAGE_MODEL_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains Image Model (empty if none selected)"
@@ -33523,7 +33522,7 @@
       },
       "value": "[if(not(equals(parameters('imageModelChoice'), 'none')), format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName')), '')]"
     },
-    "AZURE_OPENAI_API_VERSION": {
+    "AZURE_ENV_OPENAI_API_VERSION": {
       "type": "string",
       "metadata": {
         "description": "Contains Azure OpenAI API Version"
@@ -33558,7 +33557,7 @@
       },
       "value": "[if(and(parameters('enableMonitoring'), not(variables('useExistingLogAnalytics'))), reference('applicationInsights').outputs.connectionString.value, '')]"
     },
-    "AZURE_ENV_OPENAI_LOCATION": {
+    "AZURE_ENV_AI_SERVICE_LOCATION": {
       "type": "string",
       "metadata": {
         "description": "Contains the location used for AI Services deployment"
@@ -33586,7 +33585,7 @@
       },
       "value": "[if(parameters('enablePrivateNetworking'), '', reference('containerInstance').outputs.fqdn.value)]"
     },
-    "ACR_NAME": {
+    "AZURE_ENV_CONTAINER_REGISTRY_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains ACR Name"
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 00c481f2e..e2a85f1c5 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -9,43 +9,43 @@
       "value": "${AZURE_LOCATION}"
     },
     "secondaryLocation": {
-      "value": "${SECONDARY_LOCATION}"
+      "value": "${AZURE_ENV_SECONDARY_LOCATION}"
     },
     "gptModelName": {
-      "value": "${AZURE_OPENAI_GPT_MODEL}"
+      "value": "${AZURE_ENV_GPT_MODEL_NAME}"
     },
     "gptModelVersion": {
-      "value": "${GPT_MODEL_VERSION}"
+      "value": "${AZURE_ENV_GPT_MODEL_VERSION}"
     },
     "gptModelDeploymentType": {
-      "value": "${GPT_MODEL_DEPLOYMENT_TYPE}"
+      "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
     },
     "gptModelCapacity": {
-      "value": "${GPT_MODEL_CAPACITY}"
+      "value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
     },
     "imageModelChoice": {
-      "value": "${AZURE_OPENAI_IMAGE_MODEL}"
+      "value": "${AZURE_ENV_IMAGE_MODEL_NAME}"
     },
     "imageModelCapacity": {
-      "value": "${IMAGE_MODEL_CAPACITY}"
+      "value": "${AZURE_ENV_IMAGE_MODEL_CAPACITY}"
     },
     "azureOpenaiAPIVersion": {
-      "value": "${AZURE_OPENAI_API_VERSION}"
+      "value": "${AZURE_ENV_OPENAI_API_VERSION}"
     },
     "azureAiServiceLocation": {
-      "value": "${AZURE_ENV_OPENAI_LOCATION}"
+      "value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
     },
     "existingLogAnalyticsWorkspaceId": {
-      "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
+      "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID}"
     },
     "azureExistingAIProjectResourceId": {
-      "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
+      "value": "${AZURE_ENV_FOUNDRY_PROJECT_RID}"
     },
     "acrName": {
-      "value": "${ACR_NAME}"
+      "value": "${AZURE_ENV_CONTAINER_REGISTRY_NAME}"
     },
     "imageTag": {
-      "value": "${IMAGE_TAG=latest}"
+      "value": "${AZURE_ENV_IMAGE_TAG=latest}"
     }
   }
 }
diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json
index 0cc363c9d..bce19cf2b 100644
--- a/infra/main.waf.parameters.json
+++ b/infra/main.waf.parameters.json
@@ -9,43 +9,43 @@
       "value": "${AZURE_LOCATION}"
     },
     "secondaryLocation": {
-      "value": "${SECONDARY_LOCATION}"
+      "value": "${AZURE_ENV_SECONDARY_LOCATION}"
     },
     "gptModelName": {
-      "value": "${AZURE_OPENAI_GPT_MODEL}"
+      "value": "${AZURE_ENV_GPT_MODEL_NAME}"
     },
     "gptModelVersion": {
-      "value": "${GPT_MODEL_VERSION}"
+      "value": "${AZURE_ENV_GPT_MODEL_VERSION}"
     },
     "gptModelDeploymentType": {
-      "value": "${GPT_MODEL_DEPLOYMENT_TYPE}"
+      "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
     },
     "gptModelCapacity": {
-      "value": "${GPT_MODEL_CAPACITY}"
+      "value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
     },
     "imageModelChoice": {
-      "value": "${AZURE_OPENAI_IMAGE_MODEL}"
+      "value": "${AZURE_ENV_IMAGE_MODEL_NAME}"
     },
     "imageModelCapacity": {
-      "value": "${IMAGE_MODEL_CAPACITY}"
+      "value": "${AZURE_ENV_IMAGE_MODEL_CAPACITY}"
     },
     "azureOpenaiAPIVersion": {
-      "value": "${AZURE_OPENAI_API_VERSION}"
+      "value": "${AZURE_ENV_OPENAI_API_VERSION}"
     },
     "azureAiServiceLocation": {
-      "value": "${AZURE_ENV_OPENAI_LOCATION}"
+      "value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
     },
     "existingLogAnalyticsWorkspaceId": {
-      "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
+      "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID}"
     },
     "azureExistingAIProjectResourceId": {
-      "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
+      "value": "${AZURE_ENV_FOUNDRY_PROJECT_RID}"
     },
     "acrName": {
-      "value": "${ACR_NAME}"
+      "value": "${AZURE_ENV_CONTAINER_REGISTRY_NAME}"
     },
     "imageTag": {
-      "value": "${IMAGE_TAG=latest}"
+      "value": "${AZURE_ENV_IMAGE_TAG=latest}"
     },
     "enablePrivateNetworking": {
       "value": true
diff --git a/scripts/checkquota.sh b/scripts/checkquota.sh
index 7b87424bd..f7a21131c 100644
--- a/scripts/checkquota.sh
+++ b/scripts/checkquota.sh
@@ -9,12 +9,12 @@
 # Auto-detects mode based on environment variables.
 #
 # Usage (local):
-#   bash checkquota.sh [image_model_choice]
+#   bash checkquota.sh [model]   # e.g. gpt-image-1-mini | gpt-image-1.5 | none
 #   bash checkquota.sh gpt-image-1-mini
 #   bash checkquota.sh none
 #
 # Usage (CI - via env vars):
-#   Set AZURE_SUBSCRIPTION_ID, GPT_MIN_CAPACITY, AZURE_REGIONS, IMAGE_MODEL_CHOICE
+#   Set AZURE_SUBSCRIPTION_ID, GPT_MIN_CAPACITY, AZURE_REGIONS, AZURE_ENV_IMAGE_MODEL_NAME
 #   Authentication is handled externally via OIDC (az login already done before this script runs)
 # =============================================================================
 
@@ -28,9 +28,9 @@ fi
 # ---- Configuration ----
 # In local mode, image model can be passed as first argument
 if [[ "$RUN_MODE" == "local" ]]; then
-    IMAGE_MODEL_CHOICE="${1:-${IMAGE_MODEL_CHOICE:-gpt-image-1-mini}}"
+    AZURE_ENV_IMAGE_MODEL_NAME="${1:-${AZURE_ENV_IMAGE_MODEL_NAME:-gpt-image-1-mini}}"
 else
-    IMAGE_MODEL_CHOICE="${IMAGE_MODEL_CHOICE:-gpt-image-1-mini}"
+    AZURE_ENV_IMAGE_MODEL_NAME="${AZURE_ENV_IMAGE_MODEL_NAME:-gpt-image-1-mini}"
 fi
 
 GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY:-150}"
@@ -53,8 +53,8 @@ IMAGE_MODEL_QUOTA_NAME=(
 
 # ---- Validate image model choice ----
 ALLOWED_MODELS=("gpt-image-1-mini" "gpt-image-1.5" "none")
-if [[ ! " ${ALLOWED_MODELS[@]} " =~ " ${IMAGE_MODEL_CHOICE} " ]]; then
-    echo "❌ ERROR: Invalid image model choice: '$IMAGE_MODEL_CHOICE'"
+if [[ ! " ${ALLOWED_MODELS[@]} " =~ " ${AZURE_ENV_IMAGE_MODEL_NAME} " ]]; then
+    echo "❌ ERROR: Invalid image model choice: '$AZURE_ENV_IMAGE_MODEL_NAME'"
     echo "   Allowed values: ${ALLOWED_MODELS[*]}"
     exit 1
 fi
@@ -91,7 +91,7 @@ fi
 echo ""
 echo "📋 Configuration:"
 echo "   Mode: $RUN_MODE"
-echo "   Image Model Choice: $IMAGE_MODEL_CHOICE"
+echo "   Image Model Choice: $AZURE_ENV_IMAGE_MODEL_NAME"
 echo "   GPT Min Capacity: $GPT_MIN_CAPACITY"
 echo "   Image Model Min Capacity: $IMAGE_MODEL_MIN_CAPACITY"
 echo "   Regions to check: ${REGIONS[*]}"
@@ -104,10 +104,10 @@ MIN_CAPACITY=(
 )
 
 # Add image model to quota check if not 'none'
-IMAGE_QUOTA_NAME="${IMAGE_MODEL_QUOTA_NAME[$IMAGE_MODEL_CHOICE]}"
+IMAGE_QUOTA_NAME="${IMAGE_MODEL_QUOTA_NAME[$AZURE_ENV_IMAGE_MODEL_NAME]}"
 if [[ -n "$IMAGE_QUOTA_NAME" ]]; then
     MIN_CAPACITY["$IMAGE_QUOTA_NAME"]=$IMAGE_MODEL_MIN_CAPACITY
-    echo "🖼️  Image model '$IMAGE_MODEL_CHOICE' added to quota check (key: $IMAGE_QUOTA_NAME, min capacity: $IMAGE_MODEL_MIN_CAPACITY)"
+    echo "🖼️  Image model '$AZURE_ENV_IMAGE_MODEL_NAME' added to quota check (key: $IMAGE_QUOTA_NAME, min capacity: $IMAGE_MODEL_MIN_CAPACITY)"
 else
     echo "ℹ️  Image model set to 'none' — skipping image model quota check."
 fi
@@ -170,7 +170,7 @@ echo ""
 echo "========================================"
 if [ -z "$VALID_REGION" ]; then
     echo "❌ No region with sufficient quota found!"
-    echo "   Image Model: $IMAGE_MODEL_CHOICE"
+    echo "   Image Model: $AZURE_ENV_IMAGE_MODEL_NAME"
     echo "   Checked regions: ${REGIONS[*]}"
 
     # In CI mode, set GITHUB_ENV variable instead of exiting with error
diff --git a/scripts/deploy.ps1 b/scripts/deploy.ps1
index bed9b90a9..1da9746f8 100644
--- a/scripts/deploy.ps1
+++ b/scripts/deploy.ps1
@@ -42,10 +42,10 @@ Set-Location $ProjectDir
 # Configuration from environment or prompt
 $ResourceGroup = if ($env:RESOURCE_GROUP) { $env:RESOURCE_GROUP } else { $null }
 $Location = if ($env:LOCATION) { $env:LOCATION } else { "eastus" }
-$AcrName = if ($env:ACR_NAME) { $env:ACR_NAME } else { $null }
+$AcrName = if ($env:AZURE_ENV_CONTAINER_REGISTRY_NAME) { $env:AZURE_ENV_CONTAINER_REGISTRY_NAME } else { $null }
 $ContainerName = if ($env:CONTAINER_NAME) { $env:CONTAINER_NAME } else { "aci-contentgen-backend" }
 $AppServiceName = if ($env:APP_SERVICE_NAME) { $env:APP_SERVICE_NAME } else { $null }
-$ImageTag = if ($env:IMAGE_TAG) { $env:IMAGE_TAG } else { "latest" }
+$ImageTag = if ($env:AZURE_ENV_IMAGE_TAG) { $env:AZURE_ENV_IMAGE_TAG } else { "latest" }
 
 Write-Host ""
 Write-Host "Current configuration:"
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 10bbbbfa4..efc48ccc2 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -39,19 +39,19 @@ cd "$PROJECT_DIR"
 # Default configuration
 RESOURCE_GROUP="${RESOURCE_GROUP:-}"
 LOCATION="${LOCATION:-eastus}"
-ACR_NAME="${ACR_NAME:-}"
+AZURE_ENV_CONTAINER_REGISTRY_NAME="${AZURE_ENV_CONTAINER_REGISTRY_NAME:-}"
 CONTAINER_NAME="${CONTAINER_NAME:-aci-contentgen-backend}"
 APP_SERVICE_NAME="${APP_SERVICE_NAME:-}"
-IMAGE_TAG="${IMAGE_TAG:-latest}"
+AZURE_ENV_IMAGE_TAG="${AZURE_ENV_IMAGE_TAG:-latest}"
 
 echo ""
 echo "Current configuration:"
 echo "  Resource Group: ${RESOURCE_GROUP:-<not set>}"
 echo "  Location: $LOCATION"
-echo "  ACR Name: ${ACR_NAME:-<not set>}"
+echo "  ACR Name: ${AZURE_ENV_CONTAINER_REGISTRY_NAME:-<not set>}"
 echo "  Container Name: $CONTAINER_NAME"
 echo "  App Service: ${APP_SERVICE_NAME:-<not set>}"
-echo "  Image Tag: $IMAGE_TAG"
+echo "  Image Tag: $AZURE_ENV_IMAGE_TAG"
 echo ""
 
 # Prompt for missing values
@@ -59,8 +59,8 @@ if [ -z "$RESOURCE_GROUP" ]; then
     read -p "Enter Resource Group name: " RESOURCE_GROUP
 fi
 
-if [ -z "$ACR_NAME" ]; then
-    read -p "Enter Azure Container Registry name: " ACR_NAME
+if [ -z "$AZURE_ENV_CONTAINER_REGISTRY_NAME" ]; then
+    read -p "Enter Azure Container Registry name: " AZURE_ENV_CONTAINER_REGISTRY_NAME
 fi
 
 if [ -z "$APP_SERVICE_NAME" ]; then
@@ -97,16 +97,16 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     cd "$PROJECT_DIR/src"
     
     # Login to ACR
-    az acr login --name "$ACR_NAME"
+    az acr login --name "$AZURE_ENV_CONTAINER_REGISTRY_NAME"
     
     # Build and push using ACR tasks
     az acr build \
-        --registry "$ACR_NAME" \
-        --image "contentgen-backend:$IMAGE_TAG" \
+        --registry "$AZURE_ENV_CONTAINER_REGISTRY_NAME" \
+        --image "contentgen-backend:$AZURE_ENV_IMAGE_TAG" \
         --file WebApp.Dockerfile \
         .
     
-    echo "✓ Container built and pushed to $ACR_NAME.azurecr.io/contentgen-backend:$IMAGE_TAG"
+    echo "✓ Container built and pushed to $AZURE_ENV_CONTAINER_REGISTRY_NAME.azurecr.io/contentgen-backend:$AZURE_ENV_IMAGE_TAG"
     
     # Step 2: Get the current container's managed identity
     echo ""
diff --git a/scripts/local_dev.ps1 b/scripts/local_dev.ps1
index 6978846ba..854c51079 100644
--- a/scripts/local_dev.ps1
+++ b/scripts/local_dev.ps1
@@ -109,7 +109,7 @@ function Ensure-AzureAIUserRole {
     $foundryResourceId = $null
     if (Test-Path ".env") {
         Get-Content ".env" | ForEach-Object {
-            if ($_ -match "^AZURE_EXISTING_AI_PROJECT_RESOURCE_ID=(.*)$") { $existingProjectId = $matches[1].Trim('"').Trim("'") }
+            if ($_ -match "^AZURE_ENV_FOUNDRY_PROJECT_RID=(.*)$") { $existingProjectId = $matches[1].Trim('"').Trim("'") }
             if ($_ -match "^AI_FOUNDRY_RESOURCE_ID=(.*)$") { $foundryResourceId = $matches[1].Trim('"').Trim("'") }
         }
     }
@@ -121,7 +121,7 @@ function Ensure-AzureAIUserRole {
     } elseif ($foundryResourceId) {
         $scope = $foundryResourceId
     } else {
-        Write-Error "Neither AZURE_EXISTING_AI_PROJECT_RESOURCE_ID nor AI_FOUNDRY_RESOURCE_ID found in .env"
+        Write-Error "Neither AZURE_ENV_FOUNDRY_PROJECT_RID nor AI_FOUNDRY_RESOURCE_ID found in .env"
         exit 1
     }
     
diff --git a/scripts/local_dev.sh b/scripts/local_dev.sh
index 8bf811d92..67a55b8a1 100644
--- a/scripts/local_dev.sh
+++ b/scripts/local_dev.sh
@@ -105,7 +105,7 @@ ensure_azure_ai_user_role() {
     local existing_project_id=""
     local foundry_resource_id=""
     if [ -f ".env" ]; then
-        existing_project_id=$(grep "^AZURE_EXISTING_AI_PROJECT_RESOURCE_ID=" .env | cut -d'=' -f2- | tr -d '"' | tr -d "'" || echo "")
+        existing_project_id=$(grep "^AZURE_ENV_FOUNDRY_PROJECT_RID=" .env | cut -d'=' -f2- | tr -d '"' | tr -d "'" || echo "")
         foundry_resource_id=$(grep "^AI_FOUNDRY_RESOURCE_ID=" .env | cut -d'=' -f2- | tr -d '"' | tr -d "'" || echo "")
     fi
     
@@ -115,7 +115,7 @@ ensure_azure_ai_user_role() {
     elif [ -n "$foundry_resource_id" ]; then
         scope="$foundry_resource_id"
     else
-        print_error "Neither AZURE_EXISTING_AI_PROJECT_RESOURCE_ID nor AI_FOUNDRY_RESOURCE_ID found in .env"
+        print_error "Neither AZURE_ENV_FOUNDRY_PROJECT_RID nor AI_FOUNDRY_RESOURCE_ID found in .env"
         exit 1
     fi
     
diff --git a/scripts/sample_content_generation.py b/scripts/sample_content_generation.py
index 1a75d5def..cf9b55c99 100644
--- a/scripts/sample_content_generation.py
+++ b/scripts/sample_content_generation.py
@@ -8,9 +8,9 @@
 Prerequisites:
 1. Set up environment variables (or use a .env file):
    - AZURE_OPENAI_ENDPOINT: Your Azure OpenAI endpoint
-   - AZURE_OPENAI_GPT_MODEL: GPT model deployment name
+   - AZURE_ENV_GPT_MODEL_NAME: GPT model deployment name
    - AZURE_OPENAI_GPT_IMAGE_ENDPOINT: (Optional) Endpoint for images
-   - AZURE_OPENAI_IMAGE_MODEL: Image model name (e.g., gpt-image-1-mini)
+   - AZURE_ENV_IMAGE_MODEL_NAME: Image model name (e.g., gpt-image-1-mini)
    - AZURE_COSMOS_ENDPOINT: Your CosmosDB endpoint
    - AZURE_COSMOS_DATABASE_NAME: content-generation
    - AZURE_COSMOS_CONVERSATIONS_CONTAINER: conversations
diff --git a/scripts/sample_image_generation.py b/scripts/sample_image_generation.py
index 19c858041..d6710d185 100644
--- a/scripts/sample_image_generation.py
+++ b/scripts/sample_image_generation.py
@@ -9,7 +9,7 @@
 1. Set up environment variables (or use a .env file):
    - AZURE_OPENAI_ENDPOINT: Your Azure OpenAI endpoint
     - AZURE_OPENAI_GPT_IMAGE_ENDPOINT: (Optional) Dedicated GPT image endpoint
-    - AZURE_OPENAI_IMAGE_MODEL: Use "gpt-image-1-mini" or "gpt-image-1.5"
+    - AZURE_ENV_IMAGE_MODEL_NAME: Use "gpt-image-1-mini" or "gpt-image-1.5"
    
 2. Ensure you have RBAC access:
    - "Cognitive Services OpenAI User" role on the Azure OpenAI resource
diff --git a/src/backend/agents/image_content_agent.py b/src/backend/agents/image_content_agent.py
index 0d2d75c02..c5cce59d5 100644
--- a/src/backend/agents/image_content_agent.py
+++ b/src/backend/agents/image_content_agent.py
@@ -74,7 +74,7 @@ async def generate_image(
     """
     Generate a marketing image using DALL-E 3, gpt-image-1-mini, or gpt-image-1.5.
 
-    The model used is determined by AZURE_OPENAI_IMAGE_MODEL setting.
+    The model used is determined by AZURE_ENV_IMAGE_MODEL_NAME setting.
 
     Args:
         prompt: The main image generation prompt
diff --git a/src/backend/settings.py b/src/backend/settings.py
index c28a72e70..fd178b029 100644
--- a/src/backend/settings.py
+++ b/src/backend/settings.py
@@ -9,7 +9,7 @@
 import os
 from typing import List, Optional
 
-from pydantic import BaseModel, Field, model_validator
+from pydantic import AliasChoices, BaseModel, Field, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Self
 
@@ -60,12 +60,18 @@ class _AzureOpenAISettings(BaseSettings):
         env_ignore_empty=True,
     )
 
-    gpt_model: str = Field(default="gpt-5", alias="AZURE_OPENAI_GPT_MODEL")
+    gpt_model: str = Field(
+        default="gpt-5",
+        validation_alias=AliasChoices("AZURE_ENV_GPT_MODEL_NAME", "AZURE_OPENAI_GPT_MODEL")
+    )
     model: str = "gpt-5"
 
     # Image generation model settings
     # Supported models: "gpt-image-1-mini" or "gpt-image-1.5"
-    image_model: str = Field(default="gpt-image-1-mini", alias="AZURE_OPENAI_IMAGE_MODEL")
+    image_model: str = Field(
+        default="gpt-image-1-mini",
+        validation_alias=AliasChoices("AZURE_ENV_IMAGE_MODEL_NAME", "AZURE_OPENAI_IMAGE_MODEL")
+    )
 
     # gpt-image-1-mini or gpt-image-1.5 specific endpoint
     gpt_image_endpoint: Optional[str] = Field(default=None, alias="AZURE_OPENAI_GPT_IMAGE_ENDPOINT")
@@ -76,7 +82,10 @@ class _AzureOpenAISettings(BaseSettings):
     top_p: float = 0.95
     max_tokens: int = 2000
     stream: bool = True
-    api_version: str = "2024-06-01"
+    api_version: str = Field(
+        default="2024-06-01",
+        validation_alias=AliasChoices("AZURE_ENV_OPENAI_API_VERSION", "AZURE_OPENAI_API_VERSION")
+    )
     preview_api_version: str = "2024-02-01"
     image_api_version: str = Field(default="2025-04-01-preview", alias="AZURE_OPENAI_IMAGE_API_VERSION")
 
diff --git a/src/tests/conftest.py b/src/tests/conftest.py
index bd8f06f34..8cff0bac9 100644
--- a/src/tests/conftest.py
+++ b/src/tests/conftest.py
@@ -74,7 +74,8 @@ def mock_environment(monkeypatch):
     env_vars = {
         # Azure OpenAI (required - _AzureOpenAISettings)
         "AZURE_OPENAI_ENDPOINT": "https://test-openai.openai.azure.com/",
-        "AZURE_OPENAI_API_VERSION": "2024-08-01-preview",
+        "AZURE_ENV_OPENAI_API_VERSION": "2024-08-01-preview",
+        "AZURE_OPENAI_API_VERSION": "2024-08-01-preview",  # Legacy for backward compatibility test
 
         # Azure Cosmos DB (_CosmosSettings uses AZURE_COSMOS_ prefix)
         "AZURE_COSMOS_ENDPOINT": "https://test-cosmos.documents.azure.com:443/",
diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py
index 13968cfde..6b5dd2a9e 100644
--- a/src/tests/test_settings.py
+++ b/src/tests/test_settings.py
@@ -76,13 +76,48 @@ def test_effective_image_model_returns_image_model(self):
         """Test effective_image_model returns image_model directly."""
         from settings import _AzureOpenAISettings
 
+        with patch.dict(os.environ, {
+            "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
+            "AZURE_ENV_IMAGE_MODEL_NAME": "gpt-image-1.5"
+        }, clear=False):
+            settings = _AzureOpenAISettings()
+            assert settings.effective_image_model == "gpt-image-1.5"
+
+    def test_image_model_with_legacy_env_var(self):
+        """Test image_model loads from legacy AZURE_OPENAI_IMAGE_MODEL variable."""
+        from settings import _AzureOpenAISettings
+
         with patch.dict(os.environ, {
             "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
             "AZURE_OPENAI_IMAGE_MODEL": "gpt-image-1.5"
         }, clear=False):
             settings = _AzureOpenAISettings()
+            assert settings.image_model == "gpt-image-1.5"
             assert settings.effective_image_model == "gpt-image-1.5"
 
+    def test_gpt_model_with_legacy_env_var(self):
+        """Test gpt_model loads from legacy AZURE_OPENAI_GPT_MODEL variable."""
+        from settings import _AzureOpenAISettings
+
+        with patch.dict(os.environ, {
+            "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
+            "AZURE_OPENAI_GPT_MODEL": "gpt-4o"
+        }, clear=False):
+            settings = _AzureOpenAISettings()
+            assert settings.gpt_model == "gpt-4o"
+
+    def test_api_version_with_legacy_env_var(self):
+        """Test api_version loads from legacy AZURE_OPENAI_API_VERSION variable."""
+        from settings import _AzureOpenAISettings
+
+        with patch.dict(os.environ, {
+            "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
+            "AZURE_OPENAI_API_VERSION": "2023-12-01-preview",
+            "AZURE_ENV_OPENAI_API_VERSION": ""  # Clear new env var to test legacy
+        }, clear=False):
+            settings = _AzureOpenAISettings()
+            assert settings.api_version == "2023-12-01-preview"
+
 
 class TestImageGenerationEnabled:
     """Tests for image_generation_enabled property logic."""
@@ -93,7 +128,7 @@ def test_disabled_with_none_model(self):
 
         with patch.dict(os.environ, {
             "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
-            "AZURE_OPENAI_IMAGE_MODEL": "none"
+            "AZURE_ENV_IMAGE_MODEL_NAME": "none"
         }, clear=False):
             settings = _AzureOpenAISettings()
             assert settings.image_generation_enabled is False
@@ -104,7 +139,7 @@ def test_disabled_with_disabled_model(self):
 
         with patch.dict(os.environ, {
             "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
-            "AZURE_OPENAI_IMAGE_MODEL": "disabled"
+            "AZURE_ENV_IMAGE_MODEL_NAME": "disabled"
         }, clear=False):
             settings = _AzureOpenAISettings()
             assert settings.image_generation_enabled is False
@@ -115,7 +150,7 @@ def test_enabled_with_valid_model_and_endpoint(self):
 
         with patch.dict(os.environ, {
             "AZURE_OPENAI_ENDPOINT": "https://test.openai.azure.com",
-            "AZURE_OPENAI_IMAGE_MODEL": "gpt-image-1-mini"
+            "AZURE_ENV_IMAGE_MODEL_NAME": "gpt-image-1-mini"
         }, clear=False):
             settings = _AzureOpenAISettings()
             assert settings.image_generation_enabled is True