diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ad429a4..31bbae5 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -27,27 +27,16 @@ jobs:
         client-id: ${{ secrets.AZURE_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-
-    - name: Validate Bicep template
-      uses: azure/arm-deploy@v1
-      with:
-        scope: subscription
-        region: ${{ env.LOCATION }}
-        template: infra/bicep/main.bicep
-        parameters: infra/bicep/main.params.json
-        deploymentName: ${{ env.DEPLOYMENT_NAME }}
-        additionalArguments: "--what-if"
-
     - name: Deploy Bicep template
-      if: github.ref == 'refs/heads/main'
       uses: azure/arm-deploy@v1
       with:
         scope: subscription
         region: ${{ env.LOCATION }}
-        template: infra/bicep/main.bicep
-        parameters: infra/bicep/main.params.json
+        template: bicep/main.bicep
+        parameters: bicep/main.params.json
         deploymentName: ${{ env.DEPLOYMENT_NAME }}
   none-test:
+    name: Tests without access
     needs: bicep
     runs-on: ubuntu-latest
     environment: 1-none
@@ -63,6 +52,7 @@ jobs:
     - name: Use Keyweave with No Access Policies
       run: cargo run -- --vault-name bvdbkeyweavetweukvt1
   get-test:
+    name: Tests with Get access
     needs: bicep
     runs-on: ubuntu-latest
     environment: 2-get
@@ -78,6 +68,7 @@ jobs:
     - name: Use Keyweave with Only Get Access Policy
       run: cargo run -- --vault-name bvdbkeyweavetweukvt1
   list-test:
+    name: Tests with List access
     needs: bicep
     runs-on: ubuntu-latest
     environment: 3-list
@@ -93,6 +84,7 @@ jobs:
     - name: Use Keyweave with Only List Access Policy
       run: cargo run -- --vault-name bvdbkeyweavetweukvt1
   get-list-test:
+    name: Tests with Get and List access
     needs: bicep
     runs-on: ubuntu-latest
     environment: 4-get-list