diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fde68d4..16cd9b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,18 +31,19 @@ jobs:
   publish-extension:
     runs-on: ubuntu-latest
     needs: js-test-and-release
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    if: needs.js-test-and-release.outputs.release == 'true'
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: npm
-      - run: npm ci
+      - uses: ipfs/aegir/actions/cache-node-modules@main
       - run: npm run package
       - run: npm run publish:chrome-store
         env:
           CHROME_CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }}
           CHROME_CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
           CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
-          CHROME_EXTENSION_ID: ${{ vars.CHROME_EXTENSION_ID }}
\ No newline at end of file
+          CHROME_EXTENSION_ID: ${{ vars.CHROME_EXTENSION_ID }}
diff --git a/package.json b/package.json
index da467b1..6f03480 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
   "scripts": {
     "sync-version": "node scripts/sync-version.mjs",
     "build": "npm run sync-version && tsc && cp src/manifest.json dist/ && cp src/popup.html dist/ && cp -r src/icons dist/",
-    "package": "npm run build && web-ext build --source-dir=dist --artifacts-dir=. --filename=ipfs-quicklaunch.zip --overwrite-dest",
-    "publish:chrome-store": "npx cws-publish $CHROME_CLIENT_ID $CHROME_CLIENT_SECRET $CHROME_REFRESH_TOKEN ipfs-quicklaunch.zip $CHROME_EXTENSION_ID",
+    "package": "web-ext build --source-dir=dist --artifacts-dir=. --filename=ipfs-quicklaunch.zip --overwrite-dest",
+    "publish:chrome-store": "npx cws-publish \"$CHROME_CLIENT_ID\" \"$CHROME_CLIENT_SECRET\" \"$CHROME_REFRESH_TOKEN\" ipfs-quicklaunch.zip \"$CHROME_EXTENSION_ID\"",
     "release": "aegir release",
     "start": "npm run build && web-ext run --source-dir=dist --target=chromium",
     "watch": "tsc --watch",