diff --git a/.github/workflows/azure-dev.yaml b/.github/workflows/azure-dev.yaml
index 572d5e4..f268c01 100644
--- a/.github/workflows/azure-dev.yaml
+++ b/.github/workflows/azure-dev.yaml
@@ -28,8 +28,6 @@ jobs:
       SERVICE_WEB_RESOURCE_EXISTS: ${{ vars.SERVICE_WEB_RESOURCE_EXISTS }}
       AZURE_OPENAI_LOCATION: ${{ vars.AZURE_OPENAI_LOCATION }}
       DEPLOY_AZURE_OPENAI: ${{ vars.DEPLOY_AZURE_OPENAI }}
-      AZURE_OPENAI_KEY: ${{ secrets.AZURE_OPENAI_KEY }}
-      AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
       OPENAI_CHAT_HOST: ${{ vars.OPENAI_CHAT_HOST }}
       AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZURE_OPENAI_CHAT_MODEL }}
       AZURE_OPENAI_CHAT_DEPLOYMENT: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT }}
@@ -51,10 +49,12 @@ jobs:
       AZURE_OPENAI_EMBED_DIMENSIONS: ${{ vars.AZURE_OPENAI_EMBED_DIMENSIONS }}
       OPENAICOM_KEY: ${{ secrets.OPENAICOM_KEY }}
       USE_AI_PROJECT: ${{ vars.USE_AI_PROJECT }}
+      # optional params - uncomment only when it is set
+      AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
+        
       - name: Install azd
         uses: Azure/setup-azd@v2.1.0
 
@@ -70,11 +70,12 @@ jobs:
             --federated-credential-provider "github" `
             --tenant-id "$Env:AZURE_TENANT_ID"
         shell: pwsh
-
+      
       - name: Provision Infrastructure
         run: azd provision --no-prompt
-        env:
-          AZD_INITIAL_ENVIRONMENT_CONFIG: ${{ secrets.AZD_INITIAL_ENVIRONMENT_CONFIG }}
+        # Note: Uncomment this only if you have set AZURE_OPENAI_KEY (this is an optional input parameter to azd provision)
+        # env:
+        #   AZURE_OPENAI_KEY: ${{ secrets.AZURE_OPENAI_KEY }}
 
       - name: Deploy Application
         run: azd deploy --no-prompt
diff --git a/azure.yaml b/azure.yaml
index 38c99b9..586cf1b 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -36,25 +36,3 @@ hooks:
             run: ./scripts/setup_postgres_database.sh;./scripts/setup_postgres_azurerole.sh;./scripts/setup_postgres_seeddata.sh
             interactive: true
             continueOnError: false
-pipeline:
-  variables:
-    - DEPLOY_AZURE_OPENAI
-    - OPENAI_CHAT_HOST
-    - OPENAI_EMBED_HOST
-    - AZURE_OPENAI_ENDPOINT
-    - AZURE_OPENAI_VERSION
-    - AZURE_OPENAI_CHAT_DEPLOYMENT
-    - AZURE_OPENAI_CHAT_MODEL
-    - AZURE_OPENAI_CHAT_DEPLOYMENT_VERSION
-    - AZURE_OPENAI_CHAT_DEPLOYMENT_CAPACITY
-    - AZURE_OPENAI_EVAL_DEPLOYMENT_SKU
-    - AZURE_OPENAI_EMBED_DEPLOYMENT
-    - AZURE_OPENAI_EMBED_MODEL
-    - AZURE_OPENAI_EMBED_DEPLOYMENT_VERSION
-    - AZURE_OPENAI_EMBED_DEPLOYMENT_CAPACITY
-    - AZURE_OPENAI_EMBED_DEPLOYMENT_SKU
-    - AZURE_OPENAI_EMBED_DIMENSIONS
-    - AZURE_OPENAI_EMBEDDING_COLUMN
-    - AZURE_OPENAI_EVAL_DEPLOYMENT
-    - AZURE_OPENAI_EVAL_MODEL
-    - USE_AI_PROJECT