diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f9e18157223..dd55f4b3946 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -289,9 +289,11 @@ jobs:
           if-no-files-found: error
       - name: 'Login via Azure CLI'
         if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
-          creds: ${{ secrets.BICEP_TYPES_AZURE_CREDENTIALS }}
+          client-id: ${{ secrets.BICEPTYPES_CLIENT_ID }}
+          tenant-id: ${{ secrets.BICEPTYPES_TENANT_ID }}
+          subscription-id: ${{ secrets.BICEPTYPES_SUBSCRIPTION_ID }}
       - name: Setup and verify bicep CLI
         if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
         run: |
diff --git a/.github/workflows/functional-test-cloud.yaml b/.github/workflows/functional-test-cloud.yaml
index d741089c0b0..8150605f074 100644
--- a/.github/workflows/functional-test-cloud.yaml
+++ b/.github/workflows/functional-test-cloud.yaml
@@ -377,9 +377,11 @@ jobs:
           path: ./hack/bicep-types-radius/generated
           if-no-files-found: error
       - name: 'Login via Azure CLI'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
-          creds: ${{ secrets.BICEP_TYPES_AZURE_CREDENTIALS }}
+          client-id: ${{ secrets.BICEPTYPES_CLIENT_ID }}
+          tenant-id: ${{ secrets.BICEPTYPES_TENANT_ID }}
+          subscription-id: ${{ secrets.BICEPTYPES_SUBSCRIPTION_ID }}
       - name: Setup and verify bicep CLI
         run: |
           curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
diff --git a/.github/workflows/functional-test-noncloud.yaml b/.github/workflows/functional-test-noncloud.yaml
index d93901e7f42..144aca7ea84 100644
--- a/.github/workflows/functional-test-noncloud.yaml
+++ b/.github/workflows/functional-test-noncloud.yaml
@@ -127,8 +127,7 @@ jobs:
           # Set output variables to be used in the other jobs
           echo "REL_VERSION=pr-${UNIQUE_ID}" >> $GITHUB_OUTPUT
           echo "DE_IMAGE=${{ env.DE_IMAGE }}" >> $GITHUB_OUTPUT
-          echo "DE_TAG=${{ env.DE_TAG }}" >> $GITHUB_OUTPUT
-          
+          echo "DE_TAG=${{ env.DE_TAG }}" >> $GITHUB_OUTPUT    
   tests:
     name: Run ${{ matrix.name }} functional tests
     needs: build
diff --git a/.github/workflows/validate-bicep.yaml b/.github/workflows/validate-bicep.yaml
index 6d78a50e8fd..6bb58b52383 100644
--- a/.github/workflows/validate-bicep.yaml
+++ b/.github/workflows/validate-bicep.yaml
@@ -33,19 +33,15 @@ jobs:
     name: Validate Bicep Code
     runs-on: ubuntu-latest
     steps:
+      - name: Check out repo
+        uses: actions/checkout@v4
       - name: Setup and verify bicep CLI
         run: |
           curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
           chmod +x ./bicep
           sudo mv ./bicep /usr/local/bin/bicep
           bicep --version
-      - name: Check out repo
-        uses: actions/checkout@v4
-      - name: 'Login via Azure CLI'
-        if: github.repository == 'radius-project/radius' && ((startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main'))
-        uses: azure/login@v2
-        with:
-          creds: ${{ secrets.BICEP_TYPES_AZURE_CREDENTIALS }}
+          sleep 5
       - name: Verify Bicep files
         run: ./build/validate-bicep.sh
         env:
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e377fb0533b..daf179be569 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -88,7 +88,7 @@
             },
         },
         {
-            "name": "Debug Jest Tests",
+            "name": "Debug Bicep generator integration tests",
             "type": "node",
             "request": "launch",
             "runtimeArgs": [