diff --git a/.github/actions/dependencyguard-baseline/action.yml b/.github/actions/dependencyguard-baseline/action.yml
index b1cc2b2e0..d314075b3 100644
--- a/.github/actions/dependencyguard-baseline/action.yml
+++ b/.github/actions/dependencyguard-baseline/action.yml
@@ -16,7 +16,7 @@ runs:
     - uses: actions/checkout@v3
       with:
         ref: ${{ inputs.ref }}
-        token: ${{ secrets.PAT_SPARK || secrets.GITHUB_TOKEN }}
+        token: ${{ inputs.github-token }}
     - if: ${{ inputs.pr-number }} != ''
       run: gh pr checkout "${{ inputs.pr-number }}"
       shell: bash
diff --git a/.github/actions/paparazzi-golden-images/action.yml b/.github/actions/paparazzi-golden-images/action.yml
index e226af688..2372ac6a7 100644
--- a/.github/actions/paparazzi-golden-images/action.yml
+++ b/.github/actions/paparazzi-golden-images/action.yml
@@ -16,7 +16,7 @@ runs:
     - uses: actions/checkout@v3
       with:
         lfs: true
-        token: ${{ secrets.PAT_SPARK || secrets.GITHUB_TOKEN }}
+        token: ${{ inputs.github-token }}
     - if: ${{ inputs.pr-number }} != ''
       run: gh pr checkout "${{ inputs.pr-number }}"
       shell: bash
diff --git a/.github/workflows/chat-bot-commands.yml b/.github/workflows/chat-bot-commands.yml
index 6dbea6c9c..6957ff6f6 100644
--- a/.github/workflows/chat-bot-commands.yml
+++ b/.github/workflows/chat-bot-commands.yml
@@ -30,12 +30,12 @@ jobs:
         if: github.event.issue.pull_request && contains(github.event.comment.body, 'paparazzi golden images')
         uses: ./.github/actions/paparazzi-golden-images
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.PAT_SPARK || secrets.GITHUB_TOKEN }}
           pr-number: ${{ github.event.issue.number }}
 
       - name: DependencyGuardBaseline
         if: github.event.issue.pull_request && contains(github.event.comment.body, 'dependencyGuardBaseline')
         uses: ./.github/actions/dependencyguard-baseline
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.PAT_SPARK || secrets.GITHUB_TOKEN }}
           pr-number: ${{ github.event.issue.number }}