diff --git a/.github/workflows/aw-subgraph-ci-goldsky.yml b/.github/workflows/aw-subgraph-ci-goldsky.yml
index 3b1349f..e0db3b6 100644
--- a/.github/workflows/aw-subgraph-ci-goldsky.yml
+++ b/.github/workflows/aw-subgraph-ci-goldsky.yml
@@ -54,7 +54,9 @@ jobs:
             const fs = require('fs');
             const packageJson = JSON.parse(fs.readFileSync('package.json'));
             return packageJson.version;
+      - name: Goldsky Login
+        run: pnpm exec goldsky login --token ${{secrets.GOLDSKY_API_KEY}}
       - name: Goldsky Deploy
-        run: pnpm exec goldsky subgraph deploy ${{format('auto-wrap-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph deploy ${{format('auto-wrap-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build
       - name: Goldsky Tag
-        run: pnpm exec goldsky subgraph tag ${{format('auto-wrap-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph tag ${{format('auto-wrap-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest
diff --git a/.github/workflows/fs-subgraph-ci-goldsky.yml b/.github/workflows/fs-subgraph-ci-goldsky.yml
index b63dcb0..d392a48 100644
--- a/.github/workflows/fs-subgraph-ci-goldsky.yml
+++ b/.github/workflows/fs-subgraph-ci-goldsky.yml
@@ -54,7 +54,9 @@ jobs:
             const fs = require('fs');
             const packageJson = JSON.parse(fs.readFileSync('package.json'));
             return packageJson.version;
+      - name: Goldsky Login
+        run: pnpm exec goldsky login --token ${{secrets.GOLDSKY_API_KEY}}
       - name: Goldsky Deploy
-        run: pnpm exec goldsky subgraph deploy ${{format('scheduling-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph deploy ${{format('scheduling-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build
       - name: Goldsky Tag
-        run: pnpm exec goldsky subgraph tag ${{format('scheduling-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph tag ${{format('scheduling-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest
diff --git a/.github/workflows/vs-subgraph-ci-goldsky.yml b/.github/workflows/vs-subgraph-ci-goldsky.yml
index fe7f6f7..3888db5 100644
--- a/.github/workflows/vs-subgraph-ci-goldsky.yml
+++ b/.github/workflows/vs-subgraph-ci-goldsky.yml
@@ -54,7 +54,9 @@ jobs:
             const fs = require('fs');
             const packageJson = JSON.parse(fs.readFileSync('package.json'));
             return packageJson.version;
+      - name: Goldsky Login
+        run: pnpm exec goldsky login --token ${{secrets.GOLDSKY_API_KEY}}
       - name: Goldsky Deploy
-        run: pnpm exec goldsky subgraph deploy ${{format('vesting-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph deploy ${{format('vesting-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --path ./build
       - name: Goldsky Tag
-        run: pnpm exec goldsky subgraph tag ${{format('vesting-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest --token ${{secrets.GOLDSKY_API_KEY}}
+        run: pnpm exec goldsky subgraph tag ${{format('vesting-v1-{0}/{1}', matrix.networks, steps.get-version.outputs.result) }} --tag latest