diff --git a/.github/workflows/CleanupTempRepos.yaml b/.github/workflows/CleanupTempRepos.yaml
index 5863f4553..e7352baf4 100644
--- a/.github/workflows/CleanupTempRepos.yaml
+++ b/.github/workflows/CleanupTempRepos.yaml
@@ -30,14 +30,6 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        id: app-token
-        if: ${{ vars.E2E_APP_ID != '' }}
-        with:
-          app-id: ${{ vars.E2E_APP_ID }}
-          private-key: ${{ secrets.E2E_PRIVATE_KEY }}
-          owner: ${{ github.event.inputs.githubOwner }}
-
       - name: Check E2EPAT Secret is defined
         if: ${{ vars.E2E_APP_ID == '' }}
         run: |
@@ -55,6 +47,14 @@ jobs:
         run: |
           ${{ github.workspace }}/Internal/Scripts/GetOwnerForE2ETests.ps1 -githubOwner $env:githubOwner
 
+      - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
+        id: app-token
+        if: ${{ vars.E2E_APP_ID != '' }}
+        with:
+          app-id: ${{ vars.E2E_APP_ID }}
+          private-key: ${{ secrets.E2E_PRIVATE_KEY }}
+          owner: ${{ steps.getGitHubOwner.outputs.githubOwner }}
+
       - name: Cleanup Temp Repositories
         env:
           githubOwner: ${{ steps.getGitHubOwner.outputs.githubOwner }}
diff --git a/e2eTests/scenarios/PowerPlatform/runtest.ps1 b/e2eTests/scenarios/PowerPlatform/runtest.ps1
index ed237d0eb..39e8f0c03 100644
--- a/e2eTests/scenarios/PowerPlatform/runtest.ps1
+++ b/e2eTests/scenarios/PowerPlatform/runtest.ps1
@@ -73,10 +73,8 @@ foreach($sourceRepo in $repositories) {
     Write-Host "PowerPlatform Solution Folder: $($settings.powerPlatformSolutionFolder)"
 
     # Upgrade AL-Go System Files to test version
-    # TODO: Use e2epat until bcsamples powerplatform repositories have been updated to latest version
-    RunUpdateAlGoSystemFiles -directCommit -wait -templateUrl $template -ghTokenWorkflow $e2epat -repository $repository | Out-Null
-
     SetRepositorySecret -repository $repository -name 'GHTOKENWORKFLOW' -value $algoauthapp
+    RunUpdateAlGoSystemFiles -directCommit -templateUrl $template -wait -repository $repository | Out-Null
 
     CancelAllWorkflows -repository $repository