diff --git a/.azuredevops/azure-pipeline-infrastructure.yml b/.azuredevops/azure-pipeline-infrastructure.yml
index d6980550..d773ecb4 100644
--- a/.azuredevops/azure-pipeline-infrastructure.yml
+++ b/.azuredevops/azure-pipeline-infrastructure.yml
@@ -22,8 +22,8 @@ parameters:
   displayName: Resource Group Name
   type: string
   default: 'rg-conmig-dev'
-- name: containerRegistryHost
-  displayName: Container Registry Host (exclude https://)
+- name: containerRegistryEndpoint
+  displayName: Container Registry Endpoint (exclude https://)
   type: string
   default: 'acrcontainermigrationdev.azurecr.io'
 - name: tags
@@ -40,7 +40,7 @@ variables:
   vmImageName: 'ubuntu-latest'
   envName: ${{ parameters.environmentName }}
   resourceGroupName: ${{ parameters.resourceGroupName }}
-  containerRegistryHost: ${{ parameters.containerRegistryHost }}
+  containerRegistryEndpoint: ${{ parameters.containerRegistryEndpoint }}
   tags: ${{ convertToJson(parameters.tags) }}
   enableMonitoring: ${{ parameters.enableMonitoring }}
 
@@ -76,14 +76,14 @@ stages:
             --name "deploy.$(envName).$(Build.BuildId)" \
             --resource-group $(resourceGroupName) \
             --template-file $(Build.SourcesDirectory)/infra/main.bicep \
-            --parameters solutionName=$(envName) containerRegistryHost='$(containerRegistryHost)' tags='$(tags)' enableMonitoring=$(enableMonitoring) \
+            --parameters solutionName=$(envName) containerRegistryEndpoint='$(containerRegistryEndpoint)' tags='$(tags)' enableMonitoring=$(enableMonitoring) \
             --query "properties.outputs" \
             --output json) || {
             echo "❌ ERROR: Bicep deployment failed!"
             echo "Deployment name: deploy.$(envName).$(Build.BuildId)"
             echo "Resource group: $(resourceGroupName)"
             echo "Template file: $(Build.SourcesDirectory)/infra/main.bicep"
-            echo "Parameters: solutionName=$(envName) containerRegistryHost='$(containerRegistryHost)'"
+            echo "Parameters: solutionName=$(envName) containerRegistryEndpoint='$(containerRegistryEndpoint)'"
             
             # Try to get deployment error details
             echo "Attempting to retrieve deployment error details..."
diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml
index 92efa0a0..0a07cbdd 100644
--- a/.github/workflows/azd-template-validation.yml
+++ b/.github/workflows/azd-template-validation.yml
@@ -35,8 +35,8 @@ jobs:
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_ENV_NAME: azd-${{ vars.AZURE_ENV_NAME }}-${{ env.HHMM }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
-          AZURE_AI_SERVICE_LOCATION: ${{ vars.AZURE_LOCATION }}
-          AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues
+          AZURE_ENV_AI_SERVICE_LOCATION: ${{ vars.AZURE_LOCATION }}
+          AZURE_ENV_GPT_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues
 
       - name: print result
         run: cat ${{ steps.validation.outputs.resultFile }}
\ No newline at end of file
diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index bb82fef5..73b06d3c 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -52,5 +52,5 @@ jobs:
             azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt
           fi
           azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID"
-          azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_LOCATION"
+          azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_LOCATION"
           azd up --no-prompt
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46378ec4..c286b5bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -133,7 +133,6 @@ jobs:
             --template-file infra/main.bicep \
             --parameters solutionName=${{env.SOLUTION_PREFIX}} \
             --parameters location=${{ env.AZURE_LOCATION }} \
-            --parameters aiDeploymentLocation=${{ env.AZURE_LOCATION }} \
             --parameters azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
             --parameters createdBy="pipeline" \
 
diff --git a/.github/workflows/deploy-orchestrator.yml b/.github/workflows/deploy-orchestrator.yml
index 24751fc2..cdc7e01d 100644
--- a/.github/workflows/deploy-orchestrator.yml
+++ b/.github/workflows/deploy-orchestrator.yml
@@ -37,12 +37,12 @@ on:
         required: false
         default: false
         type: boolean
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -81,8 +81,8 @@ 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 }}
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
       docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
       cleanup_resources: ${{ inputs.cleanup_resources }}
     secrets: inherit
diff --git a/.github/workflows/deploy-v2.yml b/.github/workflows/deploy-v2.yml
index 6343ffac..f85c17db 100644
--- a/.github/workflows/deploy-v2.yml
+++ b/.github/workflows/deploy-v2.yml
@@ -84,12 +84,12 @@ on:
         default: false
         type: boolean
       
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -112,8 +112,8 @@ jobs:
       exp: ${{ steps.validate.outputs.exp }}
       build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
       cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
-      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_existing_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_existing_log_analytics_workspace_rid }}
+      azure_existing_aiproject_resource_id: ${{ steps.validate.outputs.azure_existing_aiproject_resource_id }}
       existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
     steps:
       - name: Validate Workflow Input Parameters
@@ -127,8 +127,8 @@ jobs:
           INPUT_EXP: ${{ github.event.inputs.EXP }}
           INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
           INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
-          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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
           INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
         run: |
           echo "🔍 Validating workflow input parameters..."
@@ -209,32 +209,32 @@ jobs:
             echo "✅ cleanup_resources: '$CLEANUP_RESOURCES' 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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_EXISTING_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_EXISTING_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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
             fi
           else
-            echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
+            echo "✅ AZURE_ENV_EXISTING_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_EXISTING_AIPROJECT_RESOURCE_ID (optional, Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
+            if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_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_AIPROJECT_RESOURCE_ID 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_EXISTING_AIPROJECT_RESOURCE_ID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
             fi
           else
-            echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Not provided (optional)"
+            echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Not provided (optional)"
           fi
           
           # Validate existing_webapp_url (optional, must start with https)
@@ -268,8 +268,8 @@ jobs:
           echo "exp=$EXP_ENABLED" >> $GITHUB_OUTPUT
           echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
           echo "cleanup_resources=$CLEANUP_RESOURCES" >> $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_existing_log_analytics_workspace_rid=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
+          echo "azure_existing_aiproject_resource_id=$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
           echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
 
   Run:
@@ -284,8 +284,8 @@ jobs:
       EXP: ${{ needs.validate-inputs.outputs.exp == 'true' }}
       build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
       cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
-      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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.azure_env_existing_log_analytics_workspace_rid || '' }}
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_aiproject_resource_id || '' }}
       existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
       trigger_type: ${{ github.event_name }}
     secrets: inherit
diff --git a/.github/workflows/job-cleanup-deployment.yml b/.github/workflows/job-cleanup-deployment.yml
index d218de5c..f477a8c5 100644
--- a/.github/workflows/job-cleanup-deployment.yml
+++ b/.github/workflows/job-cleanup-deployment.yml
@@ -218,7 +218,7 @@ jobs:
             azd env set AZURE_RESOURCE_GROUP "${RESOURCE_GROUP_NAME}"
             azd env set AZURE_SUBSCRIPTION_ID "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
             azd env set AZURE_LOCATION="${AZURE_LOCATION}"
-            azd env set AZURE_AI_DEPLOYMENT_TYPE="${AZURE_ENV_OPENAI_LOCATION}"
+            azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE="${AZURE_ENV_OPENAI_LOCATION}"
           fi
 
       - name: Delete deployment using azd
diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
index 8dd0b1c5..09205fdb 100644
--- a/.github/workflows/job-deploy-linux.yml
+++ b/.github/workflows/job-deploy-linux.yml
@@ -28,10 +28,10 @@ on:
         required: false
         type: string
         default: 'false'
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
         required: false
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
         required: false
         type: string
     outputs:
@@ -59,8 +59,8 @@ jobs:
           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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
         run: |
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_EXISTING_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_EXISTING_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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_EXISTING_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_EXISTING_AIPROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
+            if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_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_AIPROJECT_RESOURCE_ID 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_EXISTING_AIPROJECT_RESOURCE_ID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
             fi
           fi
           
@@ -223,8 +223,8 @@ jobs:
           IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
           BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           EXP: ${{ inputs.EXP }}
-          AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
-          AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
+          AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID_INPUT: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          AZURE_EXISTING_AIPROJECT_RESOURCE_ID_INPUT: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
         run: |
           set -e
 
@@ -237,46 +237,44 @@ jobs:
           
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
-          azd env set AZURE_AI_DEPLOYMENT_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
-          azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
+          azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
           azd env set AZURE_LOCATION="$AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
-          azd env set AZURE_ENV_IMAGETAG="$IMAGE_TAG"
+          azd env set AZURE_ENV_IMAGE_TAG="$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 }}")
-            azd env set AZURE_CONTAINER_REGISTRY_HOST="$ACR_NAME"
-            echo "Set ACR name to: $ACR_NAME"
+            azd env set AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT="$ACR_NAME"
+            echo "Set ACR host to: $ACR_NAME"
           else
-            echo "Skipping ACR name configuration (using existing image)"
+            echo "Skipping ACR endpoint configuration (using existing image)"
           fi
 
           if [[ "$EXP" == "true" ]]; then
             echo "✅ EXP ENABLED - Setting EXP parameters..."
             
             # Set EXP variables dynamically
-            if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT" ]]; then
-              EXP_LOG_ANALYTICS_ID="$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT"
+            if [[ -n "$AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID_INPUT" ]]; then
+              EXP_LOG_ANALYTICS_ID="$AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID_INPUT"
             else
               EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
             fi
             
-            if [[ -n "$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" ]]; then
-              EXP_AI_PROJECT_ID="$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT"
+            if [[ -n "$AZURE_EXISTING_AIPROJECT_RESOURCE_ID_INPUT" ]]; then
+              EXP_AI_PROJECT_ID="$AZURE_EXISTING_AIPROJECT_RESOURCE_ID_INPUT"
             else
               EXP_AI_PROJECT_ID="${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
             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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
+            echo "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
+            azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
+            azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
           else
             echo "❌ EXP DISABLED - Skipping EXP parameters"
-            if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT" ]] || [[ -n "$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" ]]; then
+            if [[ -n "$AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID_INPUT" ]] || [[ -n "$AZURE_EXISTING_AIPROJECT_RESOURCE_ID_INPUT" ]]; then
               echo "⚠️  Warning: EXP parameter values provided but EXP is disabled. These values will be ignored."
             fi
           fi
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
index 8b8f655c..e96b538d 100644
--- a/.github/workflows/job-deploy-windows.yml
+++ b/.github/workflows/job-deploy-windows.yml
@@ -28,10 +28,10 @@ on:
         required: false
         type: string
         default: 'false'
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
         required: false
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
         required: false
         type: string
     outputs:
@@ -59,8 +59,8 @@ jobs:
           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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
         run: |
           echo "🔍 Validating workflow input parameters..."
           VALIDATION_FAILED=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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_EXISTING_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_EXISTING_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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_EXISTING_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_EXISTING_AIPROJECT_RESOURCE_ID (optional, if provided must be valid Resource ID)
+          if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
+            if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_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_AIPROJECT_RESOURCE_ID 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_EXISTING_AIPROJECT_RESOURCE_ID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
             fi
           fi
           
@@ -224,8 +224,8 @@ jobs:
           IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
           BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
           EXP: ${{ inputs.EXP }}
-          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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
         run: |
           $ErrorActionPreference = "Stop"
 
@@ -238,42 +238,40 @@ jobs:
         
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
-          azd env set AZURE_AI_DEPLOYMENT_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
-          azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
+          azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
           azd env set AZURE_LOCATION="$env:AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"
-          azd env set AZURE_ENV_IMAGETAG="$env:IMAGE_TAG"
+          azd env set AZURE_ENV_IMAGE_TAG="$env:IMAGE_TAG"
           
           # Set ACR name only when building Docker image
           if ($env:BUILD_DOCKER_IMAGE -eq "true") {
             $ACR_NAME = "${{ secrets.ACR_TEST_LOGIN_SERVER }}"
-            azd env set AZURE_CONTAINER_REGISTRY_HOST="$ACR_NAME"
-            Write-Host "Set ACR name to: $ACR_NAME"
+            azd env set AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT="$ACR_NAME"
+            Write-Host "Set ACR host to: $ACR_NAME"
           } else {
-            Write-Host "Skipping ACR name configuration (using existing image)"
+            Write-Host "Skipping ACR endpoint configuration (using existing image)"
           }
 
           if ($env:EXP -eq "true") {
             Write-Host "✅ EXP ENABLED - Setting EXP parameters..."
             
             # Set EXP variables dynamically
-            if ($env:AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID -ne "") {
-              $EXP_LOG_ANALYTICS_ID = $env:AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID
+            if ($env:AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID -ne "") {
+              $EXP_LOG_ANALYTICS_ID = $env:AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID
             } else {
               $EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
             }
             
-            if ($env:AZURE_EXISTING_AI_PROJECT_RESOURCE_ID -ne "") {
-              $EXP_AI_PROJECT_ID = $env:AZURE_EXISTING_AI_PROJECT_RESOURCE_ID
+            if ($env:AZURE_EXISTING_AIPROJECT_RESOURCE_ID -ne "") {
+              $EXP_AI_PROJECT_ID = $env:AZURE_EXISTING_AIPROJECT_RESOURCE_ID
             } else {
               $EXP_AI_PROJECT_ID = "${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
             }
             
-            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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
+            Write-Host "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
+            azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
+            azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
           } else {
             Write-Host "❌ EXP DISABLED - Skipping EXP parameters"
           }
diff --git a/.github/workflows/job-deploy.yml b/.github/workflows/job-deploy.yml
index c7489cd2..b713cd63 100644
--- a/.github/workflows/job-deploy.yml
+++ b/.github/workflows/job-deploy.yml
@@ -46,12 +46,12 @@ on:
         required: false
         default: ''
         type: string
-      AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
+      AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
         description: 'Log Analytics Workspace ID (Optional)'
         required: false
         default: ''
         type: string
-      AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
         description: 'AI Project Resource ID (Optional)'
         required: false
         default: ''
@@ -91,6 +91,7 @@ env:
   EXP: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.EXP || false) || false }}
   CLEANUP_RESOURCES: ${{ inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources }}
   BUILD_DOCKER_IMAGE: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.build_docker_image || false) || false }}
+  RG_TAGS: ${{ vars.RG_TAGS }}
 
 jobs:
   azure-setup:
@@ -119,8 +120,8 @@ jobs:
           INPUT_WAF_ENABLED: ${{ inputs.waf_enabled }}
           INPUT_EXP: ${{ inputs.EXP }}
           INPUT_CLEANUP_RESOURCES: ${{ inputs.cleanup_resources }}
-          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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
           INPUT_EXISTING_WEBAPP_URL: ${{ inputs.existing_webapp_url }}
           INPUT_DOCKER_IMAGE_TAG: ${{ inputs.docker_image_tag }}
         run: |
@@ -205,27 +206,27 @@ jobs:
             echo "✅ cleanup_resources: '$INPUT_CLEANUP_RESOURCES' is valid"
           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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
+            if [[ ! "$INPUT_AZURE_ENV_EXISTING_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_EXISTING_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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
+              echo "✅ AZURE_ENV_EXISTING_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_EXISTING_AIPROJECT_RESOURCE_ID (Azure Resource ID format)
+          if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
+            if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_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_AIPROJECT_RESOURCE_ID 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_EXISTING_AIPROJECT_RESOURCE_ID'"
               VALIDATION_FAILED=true
             else
-              echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
+              echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
             fi
           fi
           
@@ -269,8 +270,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_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+          INPUT_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
         run: |
           echo "🔍 Validating EXP configuration..."
           
@@ -279,11 +280,11 @@ jobs:
           if [[ "$INPUT_EXP" == "true" ]]; then
             EXP_ENABLED="true"
             echo "✅ EXP explicitly enabled by user input"
-          elif [[ -n "$INPUT_LOG_ANALYTICS_WORKSPACE_ID" ]] || [[ -n "$INPUT_AI_PROJECT_RESOURCE_ID" ]]; then
+          elif [[ -n "$INPUT_LOG_ANALYTICS_WORKSPACE_RID" ]] || [[ -n "$INPUT_AI_PROJECT_RESOURCE_ID" ]]; then
             echo "🔧 AUTO-ENABLING EXP: EXP parameter values were provided but EXP was not explicitly enabled."
             echo ""
             echo "You provided values for:"
-            [[ -n "$INPUT_LOG_ANALYTICS_WORKSPACE_ID" ]] && echo "  - Azure Log Analytics Workspace ID: '$INPUT_LOG_ANALYTICS_WORKSPACE_ID'"
+            [[ -n "$INPUT_LOG_ANALYTICS_WORKSPACE_RID" ]] && echo "  - Azure Log Analytics Workspace ID: '$INPUT_LOG_ANALYTICS_WORKSPACE_RID'"
             [[ -n "$INPUT_AI_PROJECT_RESOURCE_ID" ]] && echo "  - Azure AI Project Resource ID: '$INPUT_AI_PROJECT_RESOURCE_ID'"
             echo ""
             echo "✅ Automatically enabling EXP to use these values."
@@ -387,7 +388,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."
@@ -510,8 +511,8 @@ jobs:
       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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
     secrets: inherit
 
   deploy-windows:
@@ -528,6 +529,6 @@ jobs:
       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_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
+      AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
     secrets: inherit
diff --git a/docs/CustomizingAzdParameters.md b/docs/CustomizingAzdParameters.md
index 8f4062ec..31102075 100644
--- a/docs/CustomizingAzdParameters.md
+++ b/docs/CustomizingAzdParameters.md
@@ -10,16 +10,17 @@ By default this template will use the environment name as the prefix to prevent
 | ------------------------------- | ------- | ----------------------- | ------------------------------------------------------------------------------------- |
 | `AZURE_ENV_NAME`                | string  | `conmig`                | Sets the environment name prefix for all Azure resources.                             |
 | `AZURE_LOCATION`                | string  | `westus`                | Sets the location/region for all Azure resources.                                     |
-| `AZURE_SECONDARY_LOCATION`      | string  | `eastus2`               | Specifies a secondary Azure region.                                                   |
-| `AZURE_CONTAINER_REGISTRY_HOST` | string  | `myregistry.azurecr.io` | Specifies the container registry from which to pull app container images.             |
-| `AZURE_AI_DEPLOYMENT_LOCATION`  | string  | `eastus2`               | Specifies alternative location for AI model resources.                                |
-| `AZURE_AI_DEPLOYMENT_TYPE`      | string  | `GlobalStandard`        | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`).     |
-| `AZURE_AI_MODEL_NAME`           | string  | `o3`                    | Specifies the `o` model name.                                                         |
-| `AZURE_AI_MODEL_VERSION`        | string  | `2025-04-16`            | Specifies the `o` model version.                                                      |
-| `AZURE_AI_MODEL_CAPACITY`       | integer | `200`                   | Sets the model capacity (choose based on your subscription's available `o` capacity). |
+| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string  | `myregistry.azurecr.io` | Specifies the container registry endpoint from which to pull app container images.             |
+| `AZURE_ENV_AI_SERVICE_LOCATION`     | string  | `eastus2`               | Specifies the Azure region for AI services (OpenAI/AI Foundry).                       |
+| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE`      | string  | `GlobalStandard`        | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`).     |
+| `AZURE_ENV_GPT_MODEL_NAME`           | string  | `o3`                    | Specifies the AI model name.                                                         |
+| `AZURE_ENV_GPT_MODEL_VERSION`        | string  | `2025-04-16`            | Specifies the AI model version.                                                      |
+| `AZURE_ENV_GPT_MODEL_CAPACITY`       | integer | `200`                   | Sets the model capacity (choose based on your subscription's available capacity). |
+| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID` | string | ``             | Optional. Resource ID of an existing Log Analytics workspace to use.                  |
+| `AZURE_EXISTING_AIPROJECT_RESOURCE_ID` | string | ``            | Optional. Resource ID of an existing AI Foundry project to use.                       |
 | `AZURE_ENV_VM_ADMIN_USERNAME`   | string  | ``                      | The administrator username for the virtual machine.                                   |
 | `AZURE_ENV_VM_ADMIN_PASSWORD`   | string  | ``                      | The administrator password for the virtual machine.                                   |
-| `AZURE_ENV_IMAGETAG`            | string  | `latest`                | Specifies the container image tag to use for deployment.                              |
+| `AZURE_ENV_IMAGE_TAG`            | string  | `latest`                | Specifies the container image tag to use for deployment.                              |
 | `AZURE_ENV_VM_SIZE`             | string  | `Standard_D2s_v5`      | Specifies the VM size for the jumpbox virtual machine (production deployment only).   |
 
 ## How to Set a Parameter
diff --git a/docs/re-use-foundry-project.md b/docs/re-use-foundry-project.md
index 7d33dfb9..ac1e248f 100644
--- a/docs/re-use-foundry-project.md
+++ b/docs/re-use-foundry-project.md
@@ -36,7 +36,7 @@ In the left-hand menu of the project blade:
 ### 6. Set the Foundry Project Resource ID in Your Environment
 Run the following command in your terminal
 ```bash
-azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID '<Existing Foundry Project Resource ID>'
+azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID '<Existing Foundry Project Resource ID>'
 ```
 Replace `<Existing Foundry Project Resource ID>` with the value obtained from Step 5.
 
diff --git a/docs/re-use-log-analytics.md b/docs/re-use-log-analytics.md
index 1fa7a35d..81cdea14 100644
--- a/docs/re-use-log-analytics.md
+++ b/docs/re-use-log-analytics.md
@@ -23,7 +23,7 @@ Copy Resource ID that is your Workspace ID
 ### 4. Set the Workspace ID in Your Environment
 Run the following command in your terminal
 ```bash
-azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID '<Existing Log Analytics Workspace Id>'
+azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID '<Existing Log Analytics Workspace Id>'
 ```
 Replace `<Existing Log Analytics Workspace Id>` with the value obtained from Step 3.
 
diff --git a/infra/main.bicep b/infra/main.bicep
index 0aa36c88..e7bb6ec4 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -39,25 +39,10 @@ var solutionLocation = empty(location) ? resourceGroup().location : location
 @description('Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment.')
 param azureAiServiceLocation string
 
-@allowed([
-  'australiaeast'
-  'eastus'
-  'eastus2'
-  'francecentral'
-  'japaneast'
-  'norwayeast'
-  'southindia'
-  'swedencentral'
-  'uksouth'
-  'westus'
-  'westus3'
-])
-@description('Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance.')
-#disable-next-line no-unused-params
-param aiDeploymentLocation string = azureAiServiceLocation
 
-@description('Optional. The host (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry.')
-param containerRegistryHost string = 'containermigrationacr.azurecr.io'
+
+@description('Optional. The endpoint (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry.')
+param containerRegistryEndpoint string = 'containermigrationacr.azurecr.io'
 
 @description('Optional. The image tag to use for container images. Defaults to "latest".')
 param imageTag string = 'latest'
@@ -65,18 +50,18 @@ param imageTag string = 'latest'
 @minLength(1)
 @allowed(['Standard', 'GlobalStandard'])
 @description('Optional. Model deployment type. Defaults to GlobalStandard.')
-param aiDeploymentType string = 'GlobalStandard'
+param deploymentType string = 'GlobalStandard'
 
 @minLength(1)
-@description('Optional. Name of the AI model to deploy. Recommend using o3. Defaults to o3.')
-param aiModelName string = 'o3'
+@description('Optional. Name of the GPT model to deploy. Recommend using o3. Defaults to o3.')
+param gptModelName string = 'o3'
 
 @minLength(1)
-@description('Optional. Version of AI model. Review available version numbers per model before setting. Defaults to 2025-04-16.')
-param aiModelVersion string = '2025-04-16'
+@description('Optional. Version of GPT model. Review available version numbers per model before setting. Defaults to 2025-04-16.')
+param gptModelVersion string = '2025-04-16'
 
-@description('Optional. AI model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate.')
-param aiModelCapacity int = 500
+@description('Optional. GPT model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate.')
+param gptDeploymentCapacity int = 500
 
 @description('Optional. The tags to apply to all deployed Azure resources.')
 param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}
@@ -721,7 +706,7 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
   dependsOn: [storageAccount]
 }
 
-var aiModelDeploymentName = aiModelName
+var aiModelDeploymentName = gptModelName
 
 var useExistingAiFoundryAiProject = !empty(existingFoundryProjectResourceId)
 var aiFoundryAiServicesResourceGroupName = useExistingAiFoundryAiProject
@@ -752,12 +737,12 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
         name: aiModelDeploymentName
         model: {
           format: 'OpenAI'
-          name: aiModelName
-          version: aiModelVersion
+          name: gptModelName
+          version: gptModelVersion
         }
         sku: {
-          name: aiDeploymentType
-          capacity: aiModelCapacity
+          name: deploymentType
+          capacity: gptDeploymentCapacity
         }
       }
     ]
@@ -810,12 +795,12 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         name: aiModelDeploymentName
         model: {
           format: 'OpenAI'
-          name: aiModelName
-          version: aiModelVersion
+          name: gptModelName
+          version: gptModelVersion
         }
         sku: {
-          name: aiDeploymentType
-          capacity: aiModelCapacity
+          name: deploymentType
+          capacity: gptDeploymentCapacity
         }
       }
     ]
@@ -1131,7 +1116,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.18.1' = {
     containers: [
       {
         name: 'backend-api'
-        image: '${containerRegistryHost}/backend-api:${imageTag}'
+        image: '${containerRegistryEndpoint}/backend-api:${imageTag}'
         env: concat(
           [
             {
@@ -1213,7 +1198,7 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.18.1' = {
     containers: [
       {
         name: 'frontend'
-        image: '${containerRegistryHost}/frontend:${imageTag}'
+        image: '${containerRegistryEndpoint}/frontend:${imageTag}'
         env: [
           {
             name: 'API_URL'
@@ -1282,7 +1267,7 @@ module containerAppProcessor 'br/public:avm/res/app/container-app:0.18.1' = {
     containers: [
       {
         name: 'processor'
-        image: '${containerRegistryHost}/processor:${imageTag}'
+        image: '${containerRegistryEndpoint}/processor:${imageTag}'
         env: concat(
           [
             {
diff --git a/infra/main.json b/infra/main.json
index 97bddf07..9bdfd2a6 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.41.2.15936",
-      "templateHash": "10582002328170601028"
+      "version": "0.42.1.51946",
+      "templateHash": "4935154224867976262"
     }
   },
   "parameters": {
@@ -61,31 +61,11 @@
         "description": "Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment."
       }
     },
-    "aiDeploymentLocation": {
-      "type": "string",
-      "defaultValue": "[parameters('azureAiServiceLocation')]",
-      "allowedValues": [
-        "australiaeast",
-        "eastus",
-        "eastus2",
-        "francecentral",
-        "japaneast",
-        "norwayeast",
-        "southindia",
-        "swedencentral",
-        "uksouth",
-        "westus",
-        "westus3"
-      ],
-      "metadata": {
-        "description": "Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance."
-      }
-    },
-    "containerRegistryHost": {
+    "containerRegistryEndpoint": {
       "type": "string",
       "defaultValue": "containermigrationacr.azurecr.io",
       "metadata": {
-        "description": "Optional. The host (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry."
+        "description": "Optional. The endpoint (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry."
       }
     },
     "imageTag": {
@@ -95,7 +75,7 @@
         "description": "Optional. The image tag to use for container images. Defaults to \"latest\"."
       }
     },
-    "aiDeploymentType": {
+    "deploymentType": {
       "type": "string",
       "defaultValue": "GlobalStandard",
       "allowedValues": [
@@ -107,27 +87,27 @@
         "description": "Optional. Model deployment type. Defaults to GlobalStandard."
       }
     },
-    "aiModelName": {
+    "gptModelName": {
       "type": "string",
       "defaultValue": "o3",
       "minLength": 1,
       "metadata": {
-        "description": "Optional. Name of the AI model to deploy. Recommend using o3. Defaults to o3."
+        "description": "Optional. Name of the GPT model to deploy. Recommend using o3. Defaults to o3."
       }
     },
-    "aiModelVersion": {
+    "gptModelVersion": {
       "type": "string",
       "defaultValue": "2025-04-16",
       "minLength": 1,
       "metadata": {
-        "description": "Optional. Version of AI model. Review available version numbers per model before setting. Defaults to 2025-04-16."
+        "description": "Optional. Version of GPT model. Review available version numbers per model before setting. Defaults to 2025-04-16."
       }
     },
-    "aiModelCapacity": {
+    "gptDeploymentCapacity": {
       "type": "int",
       "defaultValue": 500,
       "metadata": {
-        "description": "Optional. AI model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate."
+        "description": "Optional. GPT model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate."
       }
     },
     "tags": {
@@ -301,7 +281,7 @@
     "cosmosDatabaseName": "migration_db",
     "processCosmosContainerName": "processes",
     "agentTelemetryCosmosContainerName": "agent_telemetry",
-    "aiModelDeploymentName": "[parameters('aiModelName')]",
+    "aiModelDeploymentName": "[parameters('gptModelName')]",
     "useExistingAiFoundryAiProject": "[not(empty(parameters('existingFoundryProjectResourceId')))]",
     "aiFoundryAiServicesResourceGroupName": "[if(variables('useExistingAiFoundryAiProject'), split(parameters('existingFoundryProjectResourceId'), '/')[4], format('rg-{0}', variables('solutionSuffix')))]",
     "aiFoundryAiServicesSubscriptionId": "[if(variables('useExistingAiFoundryAiProject'), split(parameters('existingFoundryProjectResourceId'), '/')[2], subscription().id)]",
@@ -4700,8 +4680,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.41.2.15936",
-              "templateHash": "10681183203421948888"
+              "version": "0.42.1.51946",
+              "templateHash": "2245351167779444314"
             }
           },
           "definitions": {
@@ -26120,8 +26100,8 @@
       },
       "dependsOn": [
         "appIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "virtualNetwork"
       ]
     },
@@ -30023,12 +30003,12 @@
                 "name": "[variables('aiModelDeploymentName')]",
                 "model": {
                   "format": "OpenAI",
-                  "name": "[parameters('aiModelName')]",
-                  "version": "[parameters('aiModelVersion')]"
+                  "name": "[parameters('gptModelName')]",
+                  "version": "[parameters('gptModelVersion')]"
                 },
                 "sku": {
-                  "name": "[parameters('aiDeploymentType')]",
-                  "capacity": "[parameters('aiModelCapacity')]"
+                  "name": "[parameters('deploymentType')]",
+                  "capacity": "[parameters('gptDeploymentCapacity')]"
                 }
               }
             ]
@@ -30070,8 +30050,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.41.2.15936",
-              "templateHash": "8365054813170845685"
+              "version": "0.42.1.51946",
+              "templateHash": "16866311185741009453"
             }
           },
           "definitions": {
@@ -30436,12 +30416,12 @@
                 "name": "[variables('aiModelDeploymentName')]",
                 "model": {
                   "format": "OpenAI",
-                  "name": "[parameters('aiModelName')]",
-                  "version": "[parameters('aiModelVersion')]"
+                  "name": "[parameters('gptModelName')]",
+                  "version": "[parameters('gptModelVersion')]"
                 },
                 "sku": {
-                  "name": "[parameters('aiDeploymentType')]",
-                  "capacity": "[parameters('aiModelCapacity')]"
+                  "name": "[parameters('deploymentType')]",
+                  "capacity": "[parameters('gptDeploymentCapacity')]"
                 }
               }
             ]
@@ -33847,8 +33827,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.41.2.15936",
-              "templateHash": "5789718034225488560"
+              "version": "0.42.1.51946",
+              "templateHash": "16351752584270870112"
             }
           },
           "parameters": {
@@ -39244,7 +39224,7 @@
             "value": [
               {
                 "name": "backend-api",
-                "image": "[format('{0}/backend-api:{1}', parameters('containerRegistryHost'), parameters('imageTag'))]",
+                "image": "[format('{0}/backend-api:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
                 "env": "[concat(createArray(createObject('name', 'APP_CONFIGURATION_URL', 'value', reference('appConfiguration').outputs.endpoint.value), createObject('name', 'AZURE_CLIENT_ID', 'value', reference('appIdentity').outputs.clientId.value)), if(parameters('enableMonitoring'), createArray(createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference('applicationInsights').outputs.connectionString.value)), createArray()))]",
                 "resources": {
                   "cpu": 1,
@@ -40891,7 +40871,7 @@
             "value": [
               {
                 "name": "frontend",
-                "image": "[format('{0}/frontend:{1}', parameters('containerRegistryHost'), parameters('imageTag'))]",
+                "image": "[format('{0}/frontend:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
                 "env": [
                   {
                     "name": "API_URL",
@@ -42539,7 +42519,7 @@
             "value": [
               {
                 "name": "processor",
-                "image": "[format('{0}/processor:{1}', parameters('containerRegistryHost'), parameters('imageTag'))]",
+                "image": "[format('{0}/processor:{1}', parameters('containerRegistryEndpoint'), parameters('imageTag'))]",
                 "env": "[concat(createArray(createObject('name', 'APP_CONFIGURATION_URL', 'value', reference('appConfiguration').outputs.endpoint.value), createObject('name', 'AZURE_CLIENT_ID', 'value', reference('appIdentity').outputs.clientId.value), createObject('name', 'AZURE_STORAGE_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value), createObject('name', 'STORAGE_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value)), if(parameters('enableMonitoring'), createArray(createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference('applicationInsights').outputs.connectionString.value)), createArray()))]",
                 "resources": {
                   "cpu": 2,
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 790abf5b..b4a1a7cc 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -8,38 +8,29 @@
       "location": {
         "value": "${AZURE_LOCATION}"
       },
-      "containerRegistryHost": {
-        "value": "${AZURE_CONTAINER_REGISTRY_HOST}"
+      "containerRegistryEndpoint": {
+        "value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
       },
       "azureAiServiceLocation": {
-        "value": "${AZURE_AI_SERVICE_LOCATION}"
+        "value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
       },
-      "aiDeploymentLocation": {
-        "value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
+      "deploymentType": {
+        "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
       },
-      "azureAiServiceLocation": {
-        "value": "${AZURE_AI_SERVICE_LOCATION}"
-      },
-      "aiDeploymentType": {
-        "value": "${AZURE_AI_DEPLOYMENT_TYPE}"
-      },
-      "aiModelName": {
-        "value": "${AZURE_AI_MODEL_NAME}"
-      },
-      "aiModelVersion": {
-        "value": "${AZURE_AI_MODEL_VERSION}"
+      "gptModelName": {
+        "value": "${AZURE_ENV_GPT_MODEL_NAME}"
       },
-      "aiModelCapacity": {
-        "value": "${AZURE_AI_MODEL_CAPACITY}"
+      "gptModelVersion": {
+        "value": "${AZURE_ENV_GPT_MODEL_VERSION}"
       },
-      "enableTelemetry": {
-        "value": true
+      "gptDeploymentCapacity": {
+        "value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
       },
       "existingLogAnalyticsWorkspaceId": {
-        "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
+        "value": "${AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID}"
       },
-      "existingFoundryProjectResourceId":{
-        "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
+      "existingFoundryProjectResourceId": {
+        "value": "${AZURE_EXISTING_AIPROJECT_RESOURCE_ID}"
       },
       "vmAdminUsername": {
         "value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
@@ -48,7 +39,7 @@
         "value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
       },
       "imageTag": {
-        "value": "${AZURE_ENV_IMAGETAG}"
+        "value": "${AZURE_ENV_IMAGE_TAG}"
       }
     }
 }
diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json
index 65a894df..3ed3de5b 100644
--- a/infra/main.waf.parameters.json
+++ b/infra/main.waf.parameters.json
@@ -8,29 +8,23 @@
       "location": {
         "value": "${AZURE_LOCATION}"
       },
-      "containerRegistryHost": {
-        "value": "${AZURE_CONTAINER_REGISTRY_HOST}"
+      "containerRegistryEndpoint": {
+        "value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
       },
       "azureAiServiceLocation": {
-        "value": "${AZURE_AI_SERVICE_LOCATION}"
+        "value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
       },
-      "aiDeploymentLocation": {
-        "value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
+      "deploymentType": {
+        "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
       },
-      "azureAiServiceLocation": {
-        "value": "${AZURE_AI_SERVICE_LOCATION}"
-      },
-      "aiDeploymentType": {
-        "value": "${AZURE_AI_DEPLOYMENT_TYPE}"
-      },
-      "aiModelName": {
-        "value": "${AZURE_AI_MODEL_NAME}"
+      "gptModelName": {
+        "value": "${AZURE_ENV_GPT_MODEL_NAME}"
       },
-      "aiModelVersion": {
-        "value": "${AZURE_AI_MODEL_VERSION}"
+      "gptModelVersion": {
+        "value": "${AZURE_ENV_GPT_MODEL_VERSION}"
       },
-      "aiModelCapacity": {
-        "value": "${AZURE_AI_MODEL_CAPACITY}"
+      "gptDeploymentCapacity": {
+        "value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
       },
       "enableTelemetry": {
         "value": true
@@ -51,13 +45,13 @@
         "value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
       },
       "existingLogAnalyticsWorkspaceId": {
-        "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
+        "value": "${AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID}"
       },
-      "existingFoundryProjectResourceId":{
-        "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
+      "existingFoundryProjectResourceId": {
+        "value": "${AZURE_EXISTING_AIPROJECT_RESOURCE_ID}"
       },
       "imageTag": {
-        "value": "${AZURE_ENV_IMAGETAG}"
+        "value": "${AZURE_ENV_IMAGE_TAG}"
       },
       "vmSize": {
         "value": "${AZURE_ENV_VM_SIZE}"
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
index 137f5b0a..bd7a5d6d 100644
--- a/infra/main_custom.bicep
+++ b/infra/main_custom.bicep
@@ -58,18 +58,18 @@ param frontendImageName string = ''
 @minLength(1)
 @allowed(['Standard', 'GlobalStandard'])
 @description('Optional. Model deployment type. Defaults to GlobalStandard.')
-param aiDeploymentType string = 'GlobalStandard'
+param deploymentType string = 'GlobalStandard'
 
 @minLength(1)
-@description('Optional. Name of the AI model to deploy. Recommend using o3. Defaults to o3.')
-param aiModelName string = 'o3'
+@description('Optional. Name of the GPT model to deploy. Recommend using o3. Defaults to o3.')
+param gptModelName string = 'o3'
 
 @minLength(1)
-@description('Optional. Version of AI model. Review available version numbers per model before setting. Defaults to 2025-04-16.')
-param aiModelVersion string = '2025-04-16'
+@description('Optional. Version of GPT model. Review available version numbers per model before setting. Defaults to 2025-04-16.')
+param gptModelVersion string = '2025-04-16'
 
-@description('Optional. AI model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate.')
-param aiModelCapacity int = 1
+@description('Optional. GPT model deployment token capacity. Lower this if initial provisioning fails due to capacity. Defaults to 50K tokens per minute to improve regional success rate.')
+param gptDeploymentCapacity int = 1
 
 @description('Optional. The tags to apply to all deployed Azure resources.')
 param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}
@@ -707,7 +707,7 @@ module containerRegistry 'br/public:avm/res/container-registry/registry:0.9.1' =
   }
 }
 
-var aiModelDeploymentName = aiModelName
+var aiModelDeploymentName = gptModelName
 
 var useExistingAiFoundryAiProject = !empty(existingFoundryProjectResourceId)
 var aiFoundryAiServicesResourceGroupName = useExistingAiFoundryAiProject
@@ -737,12 +737,12 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
         name: aiModelDeploymentName
         model: {
           format: 'OpenAI'
-          name: aiModelName
-          version: aiModelVersion
+          name: gptModelName
+          version: gptModelVersion
         }
         sku: {
-          name: aiDeploymentType
-          capacity: aiModelCapacity
+          name: deploymentType
+          capacity: gptDeploymentCapacity
         }
       }
     ]
@@ -783,12 +783,12 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.13.2'
         name: aiModelDeploymentName
         model: {
           format: 'OpenAI'
-          name: aiModelName
-          version: aiModelVersion
+          name: gptModelName
+          version: gptModelVersion
         }
         sku: {
-          name: aiDeploymentType
-          capacity: aiModelCapacity
+          name: deploymentType
+          capacity: gptDeploymentCapacity
         }
       }
     ]