diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index f2e113b89..42dc0c5b7 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -52,10 +52,4 @@ jobs:
           export ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }}
           export ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID }}
           export CHANGED_FOLDERS="${{ steps.changed-files.outputs.all_changed_files }}"
-          docker run --rm -v $(pwd):/src -w /src/test --network=host -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_TENANT_ID -e ARM_CLIENT_ID -e ARM_OIDC_REQUEST_TOKEN -e ARM_OIDC_REQUEST_URL -e ARM_USE_OIDC=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform:latest sh -c "pkenv install 1.10.2 && go mod tidy && go test -timeout=360m -v ./e2e"
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
-        with:
-          name: TestRecord-${{ inputs.pr_number }}
-          retention-days: 60
-          path: |
-            quickstart/**/TestRecord.md.tmp
\ No newline at end of file
+          docker run --rm -v $(pwd):/src -w /src/test --network=host -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_TENANT_ID -e ARM_CLIENT_ID -e ARM_OIDC_REQUEST_TOKEN -e ARM_OIDC_REQUEST_URL -e ARM_USE_OIDC=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform:latest sh -c "pkenv install 1.10.2 && go mod tidy && go test -timeout=360m -v ./e2e"
\ No newline at end of file
diff --git a/.github/workflows/pr-merged.yaml b/.github/workflows/pr-merged.yaml
deleted file mode 100644
index 73bc28cbe..000000000
--- a/.github/workflows/pr-merged.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Main Branch Push
-on:
-  push:
-    branches:
-      - main
-      - master
-    paths:
-      - 'quickstart/**'
-permissions:
-  actions: write
-  contents: write
-jobs:
-  main-branch-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: get-default-branch
-        run: |
-          branch=$(curl -s "https://api.github.com/repos/$GITHUB_REPOSITORY" | jq -r '.default_branch')
-          echo "default_branch=$branch" >> $GITHUB_ENV
-      - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
-      - uses: 8BitJonny/gh-get-current-pr@2215326c76d51bfa3f2af0a470f32677f6c0cae9 #2.1.0
-        id: PR
-      - name: Download artifact
-        id: download-artifact
-        uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e #v2.28.0
-        with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
-          workflow: e2e.yaml
-          pr: ${{ steps.PR.outputs.number }}
-          name: TestRecord-${{ steps.PR.outputs.number }}
-          path: TestRecord
-          if_no_artifact_found: ignore
-      - name: Update
-        run: |
-          sh scripts/update-test-record.sh
-      - name: Commit & Push changes
-        uses: actions-js/push@156f2b10c3aa000c44dbe75ea7018f32ae999772 #v1.4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          message: 'Update TestRecord'
-          branch: ${{ env.default_branch }}
\ No newline at end of file
diff --git a/.github/workflows/weekly-e2e.yaml b/.github/workflows/weekly-e2e.yaml
index ba0f2aa95..62cc189ff 100644
--- a/.github/workflows/weekly-e2e.yaml
+++ b/.github/workflows/weekly-e2e.yaml
@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   full-e2e-check:
-    runs-on: [self-hosted, 1ES.Pool=terraform-azurerm-doc]
+    runs-on: ubuntu-latest
     timeout-minutes: 1440
     environment:
       name: crontests
@@ -21,11 +21,12 @@ jobs:
         timeout-minutes: 1440
         run: |
           git config --global --add safe.directory '*'
-          az login --identity --username $MSI_ID > /dev/null
-          export ARM_SUBSCRIPTION_ID=$(az login --identity --username $MSI_ID | jq -r '.[0] | .id')
-          export ARM_TENANT_ID=$(az login --identity --username $MSI_ID | jq -r '.[0] | .tenantId')
-          ARM_CLIENT_ID=$(az identity list | jq -r --arg MSI_ID "$MSI_ID" '.[] | select(.principalId == $MSI_ID) | .clientId')
-          docker run --rm -v $(pwd):/src -w /src/test -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_CLIENT_ID -e ARM_TENANT_ID -e ARM_USE_MSI=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform sh -c "go mod tidy && go test -timeout=1440m -parallel 10 -v ./e2e"
+          export ARM_OIDC_REQUEST_TOKEN=$ACTIONS_ID_TOKEN_REQUEST_TOKEN
+          export ARM_OIDC_REQUEST_URL=$ACTIONS_ID_TOKEN_REQUEST_URL
+          export ARM_SUBSCRIPTION_ID=${{ secrets.ARM_SUBSCRIPTION_ID }}
+          export ARM_TENANT_ID=${{ secrets.ARM_TENANT_ID }}
+          export ARM_CLIENT_ID=${{ secrets.ARM_CLIENT_ID_CRONTEST }}
+          docker run --rm -v $(pwd):/src -w /src/test -e MSI_ID -e ARM_SUBSCRIPTION_ID -e ARM_CLIENT_ID -e ARM_TENANT_ID -e ARM_OIDC_REQUEST_TOKEN -e ARM_OIDC_REQUEST_URL -e ARM_USE_OIDC=true -e CHANGED_FOLDERS mcr.microsoft.com/azterraform sh -c "go mod tidy && go test -timeout=1440m -parallel 10 -v ./e2e"
       - name: Update
         run: |
           docker run --rm -v $(pwd):/src -w /src mcr.microsoft.com/azterraform sh scripts/update-test-record.sh