diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 8c64f8a3..9cf8ea8c 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -37,10 +37,9 @@ on:
       pre-run-script:
         required: false
         type: string
-      dispatch-script:
+      chromatic-token:
         required: false
         type: string
-        default: npm run chromatic
       run-dispatch:
         required: false
         type: boolean
@@ -53,8 +52,6 @@ on:
 jobs:
   node-ci:
     runs-on: ubuntu-latest
-    env:
-      CHROMATIC: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
     defaults:
       run:
         shell: bash
@@ -100,13 +97,9 @@ jobs:
         # CDK infrastructure build calls npm ci on /infrastructure/build, which may fail without NODE_AUTH_TOKEN
         env:
           NODE_AUTH_TOKEN: ${{ secrets.npm-auth-token || secrets.GITHUB_TOKEN }}
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
-        env:
-          CHROMATIC_TEST_ENV: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
       - name: Dispatch
         if:  ${{ inputs.run-dispatch }}
         uses: chromaui/action@v1
         with:
           workingDir: ${{ inputs.working-directory }}
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          projectToken: ${{ inputs.chromatic-token }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 673dbb31..4a3a4c26 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -29,6 +29,7 @@ jobs:
       pre-run-script: cd ../dapp && npm ci
       audit-script: npm run audit --audit-level=high
       run-dispatch: true
+      chromatic-token: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
     secrets:
       npm-auth-token: ${{ secrets.GITHUB_TOKEN }}
   build-api: