diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
index 53cb8d151..a86ce976c 100644
--- a/.github/workflows/covector-version-or-publish.yml
+++ b/.github/workflows/covector-version-or-publish.yml
@@ -126,7 +126,7 @@ jobs:
           cache-dependency-path: tooling/*/yarn.lock
 
       - name: cargo login
-        run: cargo login ${{ secrets.crate_token }}
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
       - name: git config
         run: |
           git config --global user.name "${{ github.event.pusher.name }}"
@@ -136,7 +136,7 @@ jobs:
         uses: jbolda/covector/packages/action@covector-v0
         id: covector
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
           CARGO_AUDIT_OPTIONS: ${{ secrets.CARGO_AUDIT_OPTIONS }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -145,7 +145,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: tauri-apps/create-pull-request@v3.4.1
+        uses: tauri-apps/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates
@@ -160,7 +160,7 @@ jobs:
           steps.covector.outputs.packagesPublished != ''
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.TAURI_BOT_PAT }}
+          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
           repository: tauri-apps/tauri-docs
           event-type: update-docs
 
@@ -170,7 +170,7 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'cli.rs')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.TAURI_BOT_PAT }}
+          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
           repository: tauri-apps/tauri
           event-type: publish-clijs
           inputs: '{"releaseId": "${{ steps.covector.outputs.cli.js-releaseId }}" }'
@@ -181,6 +181,6 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'cli.rs')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.TAURI_BOT_PAT }}
+          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
           repository: tauri-apps/tauri
           event-type: publish-clirs
diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml
index 51d15c0b0..d1fe19933 100644
--- a/.github/workflows/publish-cli-js.yml
+++ b/.github/workflows/publish-cli-js.yml
@@ -400,5 +400,5 @@ jobs:
           npm publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
           RELEASE_ID: ${{ github.event.inputs.releaseId }}
diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
index ede597053..1876dec9e 100755
--- a/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
+++ b/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: cargo login
-        run: cargo login ${{ secrets.CRATE_TOKEN }}
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
 
       - name: git config
         run: |
@@ -32,7 +32,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: tauri-apps/create-pull-request@v3.4.1
+        uses: tauri-apps/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates
diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
index e838c1e73..4713cbced 100644
--- a/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
+++ b/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
@@ -19,7 +19,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
 
       - name: cargo login
-        run: cargo login ${{ secrets.CRATE_TOKEN }}
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
 
       - name: git config
         run: |
@@ -36,7 +36,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: tauri-apps/create-pull-request@v3.4.1
+        uses: tauri-apps/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates