diff --git a/.github/workflows/cache-pages.yml b/.github/workflows/cache-pages.yml
index b9189e4e1..cdb357ff4 100644
--- a/.github/workflows/cache-pages.yml
+++ b/.github/workflows/cache-pages.yml
@@ -20,7 +20,9 @@ jobs:
             node-version: 20
             cache: "pnpm"
         - run: pnpm submodules
-            - run: pnpm install
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - run: pnpm install
         - run: pnpm exec tsx internal/scripts/cache-pages
           env:
             FIREBASE_PRIVATE_KEY_ID: ${{ secrets.FIREBASE_PRIVATE_KEY_ID }}
diff --git a/.github/workflows/commit-check.yml b/.github/workflows/commit-check.yml
index 3fe2ca6ee..4c59178e5 100644
--- a/.github/workflows/commit-check.yml
+++ b/.github/workflows/commit-check.yml
@@ -29,6 +29,8 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm run build
             - run: pnpm run commit-check
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 9cee6b8fc..54c995fd2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -23,6 +23,8 @@ jobs:
                     node-version: 20
                     cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm exec playwright install --with-deps
             - run: pnpm run build
diff --git a/.github/workflows/example-check.yml b/.github/workflows/example-check.yml
index 45e58543a..241e2b674 100644
--- a/.github/workflows/example-check.yml
+++ b/.github/workflows/example-check.yml
@@ -28,8 +28,9 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm build
-            - run: pnpm submodules
             - run: pnpm install
             - run: pnpm build:examples
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 668d67bf0..ff1e89ab5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,6 +26,8 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm run build
             - run: pnpm run lint
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb265b095..5005c11b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,6 +26,8 @@ jobs:
                   node-version: 20
                   cache: "pnpm"
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm install semantic-release-config-techor --workspace-root
             - run: pnpm run build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a5483ba64..ed0aeacd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,8 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm run build
             - run: pnpm test
diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml
index b7d0a59ac..6532c86b4 100644
--- a/.github/workflows/type-check.yml
+++ b/.github/workflows/type-check.yml
@@ -26,6 +26,8 @@ jobs:
                   node-version: ${{ matrix.node-version }}
                   cache: 'pnpm'
             - run: pnpm submodules
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - run: pnpm install
             - run: pnpm run build
             - run: pnpm run type-check
diff --git a/submodules.sh b/submodules.sh
index ac3568c8b..2c605584f 100755
--- a/submodules.sh
+++ b/submodules.sh
@@ -2,10 +2,7 @@
 
 set -e
 
-if [ -n "$GH_TOKEN" ]; then
-    echo "Running in CI environment, using GH_TOKEN for authentication"
-    git config --global url."https://${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
-elif [ -n "$GITHUB_TOKEN" ]; then
+if [ -n "$GITHUB_TOKEN" ]; then
     echo "Running in CI environment, using GITHUB_TOKEN for authentication"
     git config --global url."https://${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 else