diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index 842c311d248..f5a1fb3ca8e 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -299,20 +299,13 @@ jobs:
       - name: Install dependencies
         run: CI="" yarn install --frozen-lockfile
 
-      - name: Disable Git credential helper
-        run: git config --global credential.helper ""
-
-      - name: Remove existing SSH origin (if any)
-        run: git remote remove origin || true
-
-      - name: Add HTTPS origin
-        run: git remote add origin https://github.com/opencrvs/opencrvs-core.git
-
-      - name: Verify remote URL
-        run: git remote -v
+      - name: Remove extraheader config
+        run: git config --unset http.https://github.com/.extraheader
 
       - name: Fetch full Git history
-        run: git fetch --prune --unshallow
+        run: git fetch --prune --depth=100
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run Chromatic
         uses: chromaui/action@latest