diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
index 35115a84..e73c26f9 100644
--- a/.github/workflows/job-deploy-linux.yml
+++ b/.github/workflows/job-deploy-linux.yml
@@ -236,6 +236,7 @@ jobs:
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
           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_LOCATION="$AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
           azd env set AZURE_ENV_IMAGETAG="$IMAGE_TAG"
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
index b9fcfabe..f16c5e5c 100644
--- a/.github/workflows/job-deploy-windows.yml
+++ b/.github/workflows/job-deploy-windows.yml
@@ -237,6 +237,7 @@ jobs:
           # Set additional parameters
           azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
           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_LOCATION="$env:AZURE_LOCATION"
           azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"
           azd env set AZURE_ENV_IMAGETAG="$env:IMAGE_TAG"
diff --git a/.github/workflows/job-deploy.yml b/.github/workflows/job-deploy.yml
index 188b3ee0..1ddb90f1 100644
--- a/.github/workflows/job-deploy.yml
+++ b/.github/workflows/job-deploy.yml
@@ -89,7 +89,7 @@ on:
         value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED }}
 
 env:
-  GPT_MIN_CAPACITY: 150
+  GPT_MIN_CAPACITY: 500
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
   WAF_ENABLED: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.waf_enabled || false) || false }}
   EXP: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.EXP || false) || false }}
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 692f6d3c..a639c875 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -14,6 +14,9 @@
       "containerRegistryHost": {
         "value": "${AZURE_CONTAINER_REGISTRY_HOST}"
       },
+      "azureAiServiceLocation": {
+        "value": "${AZURE_AI_SERVICE_LOCATION}"
+      },
       "aiDeploymentLocation": {
         "value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
       },
diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json
index d86ce6e2..0cf92966 100644
--- a/infra/main.waf.parameters.json
+++ b/infra/main.waf.parameters.json
@@ -14,6 +14,9 @@
       "containerRegistryHost": {
         "value": "${AZURE_CONTAINER_REGISTRY_HOST}"
       },
+      "azureAiServiceLocation": {
+        "value": "${AZURE_AI_SERVICE_LOCATION}"
+      },
       "aiDeploymentLocation": {
         "value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
       },