diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index effb52b..a5712f2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,8 +50,9 @@ jobs:
         CC: ${{ matrix.compiler.CC }}
         AR: ${{ matrix.compiler.AR }}
         TARGET: ${{ github.event.repository.name }}
+        REPO_BASE_URI: https://github.com/netsurf-browser
+        TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
       run: |
-          export TARGET_WORKSPACE="$(pwd)/projects"
           source projects/env.sh
           ns-clone -d -s -b ${GITHUB_REF_NAME}
           ns-make-libs install
@@ -61,8 +62,8 @@ jobs:
         CC: ${{ matrix.compiler.CC }}
         AR: ${{ matrix.compiler.AR }}
         TARGET: ${{ github.event.repository.name }}
+        TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
       run: |
-          export TARGET_WORKSPACE="$(pwd)/projects"
           source projects/env.sh
           make -j"$(nproc)"
 
@@ -71,8 +72,8 @@ jobs:
         CC: ${{ matrix.compiler.CC }}
         AR: ${{ matrix.compiler.AR }}
         TARGET: ${{ github.event.repository.name }}
+        TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
       run: |
-          export TARGET_WORKSPACE="$(pwd)/projects"
           source projects/env.sh
           make test
 
@@ -181,6 +182,7 @@ jobs:
     - name: Build and install project libs
       env:
         HOST: "${{ matrix.toolchain }}"
+        REPO_BASE_URI: https://github.com/netsurf-browser
         TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
         TARGET: ${{ github.event.repository.name }}
         Q:
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index c313437..50c3b17 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
       with:
         fetch-depth: 1
 
@@ -39,10 +39,11 @@ jobs:
     - name: Build and install project deps
       env:
         TARGET: ${{ github.event.repository.name }}
+        REPO_BASE_URI: https://github.com/netsurf-browser
+        TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
       run: |
-          export TARGET_WORKSPACE="$(pwd)/projects"
           source projects/env.sh
-          ns-clone -d -s
+          ns-clone -d -s -b ${GITHUB_REF_NAME}
           ns-make-libs install
 
     - name: Initialize CodeQL
@@ -51,8 +52,9 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Build Library
+      env:
+        TARGET_WORKSPACE: "${{ github.workspace }}/projects" # Same as "$(pwd)/projects"
       run: |
-          export TARGET_WORKSPACE="$(pwd)/projects"
           source projects/env.sh
           make -j"$(nproc)"