diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml
index d2e2abc..752ecfc 100644
--- a/.github/workflows/azd-template-validation.yml
+++ b/.github/workflows/azd-template-validation.yml
@@ -45,7 +45,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TEMP: /tmp
           fabricCapacityMode: 'none'
-          AZURE_PRINCIPAL_ID: ${{ vars.PRINCIPAL_ID || secrets.AZURE_CLIENT_ID }}
+          AZURE_PRINCIPAL_ID: ${{ vars.PRINCIPAL_ID || secrets.AZURE_PRINCIPAL_ID }}
           AZURE_PRINCIPAL_TYPE: 'ServicePrincipal'
       - name: print result
         run: cat ${{ steps.validation.outputs.resultFile }}
diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
index 0e30910..631604c 100644
--- a/.github/workflows/azure-dev.yml
+++ b/.github/workflows/azure-dev.yml
@@ -83,8 +83,8 @@ jobs:
             echo "Resource group already exists: $RESOURCE_GROUP"
           fi
 
-          # Set for subsequent steps
-          echo "RESOURCE_GROUP=$RESOURCE_GROUP" >> $GITHUB_ENV
+          # Export as AZURE_RESOURCE_GROUP so azd provision picks up the correct RG
+          echo "AZURE_RESOURCE_GROUP=$RESOURCE_GROUP" >> $GITHUB_ENV
 
       - name: Provision Infrastructure
         id: provision-main