diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ceecf5702d..4ba1cd9400 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 2
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
         with:
           version: 10.28.0
 
@@ -47,6 +47,7 @@ jobs:
         run: pnpm test
 
       - name: Publish to Chromatic
+        if: ${{ secrets.CHROMATIC_PROJECT_TOKEN != '' }}
         uses: chromaui/action@v13.3.5
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
diff --git a/.github/workflows/packages-preview.yml b/.github/workflows/packages-preview.yml
index 6e0adfb0c8..3aec8eef71 100644
--- a/.github/workflows/packages-preview.yml
+++ b/.github/workflows/packages-preview.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 2
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
         with:
           version: 10.28.0
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 648327cdba..4041ec9bdd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 2
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v6
         with:
           version: 10.28.0