diff --git a/.github/workflows/container-host-edge.yml b/.github/workflows/container-host-edge.yml
index 06481479..fe69fb4f 100644
--- a/.github/workflows/container-host-edge.yml
+++ b/.github/workflows/container-host-edge.yml
@@ -58,6 +58,8 @@ jobs:
   deploy:
     name: 'Deploy (Edge)'
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     needs: build
     if: github.ref == 'refs/heads/main'
     environment: edge-container-host
@@ -72,7 +74,9 @@ jobs:
 
       - uses: azure/login@v1
         with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - uses: ./.github/actions/deploy-artifact-to-azure-windows-vm
         with:
diff --git a/.github/workflows/server-edge.yml b/.github/workflows/server-edge.yml
index 0179f2a2..d70584b3 100644
--- a/.github/workflows/server-edge.yml
+++ b/.github/workflows/server-edge.yml
@@ -14,9 +14,6 @@ on:
   pull_request:
   workflow_dispatch:
 
-permissions:
-  id-token: write
-
 jobs:
   build-core:
     name: 'Build (.NET 8)'