diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
index c4c9c9a..4a3b19d 100644
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   check-dist:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
 
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dfa2782..eab939e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml
index bd6a434..7403999 100644
--- a/.github/workflows/licensed.yml
+++ b/.github/workflows/licensed.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     name: Check licenses
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml
index 44d571b..a44afd0 100644
--- a/.github/workflows/publish-immutable-actions.yml
+++ b/.github/workflows/publish-immutable-actions.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml
index c8bf466..1bfb6bb 100644
--- a/.github/workflows/release-v1.yml
+++ b/.github/workflows/release-v1.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tag:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 475e533..32d526a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/setup-node@v4
         with:
@@ -37,7 +37,7 @@ jobs:
   test:
     strategy:
       matrix:
-        runs-on: [ubuntu-latest, macos-latest, windows-latest]
+        runs-on: [blacksmith-4vcpu-ubuntu-2404, macos-latest, blacksmith-4vcpu-windows-2025]
     runs-on: ${{ matrix.runs-on }}
 
     steps:
@@ -95,6 +95,7 @@ jobs:
           path: fetch-filter
 
       - name: Verify fetch filter
+        shell: bash
         run: __test__/verify-fetch-filter.sh
 
       # Sparse checkout
@@ -108,6 +109,7 @@ jobs:
           path: sparse-checkout
 
       - name: Verify sparse checkout
+        shell: bash
         run: __test__/verify-sparse-checkout.sh
 
       # Disabled sparse checkout in existing checkout
@@ -132,6 +134,7 @@ jobs:
           path: sparse-checkout-non-cone-mode
 
       - name: Verify sparse checkout (non-cone mode)
+        shell: bash
         run: __test__/verify-sparse-checkout-non-cone-mode.sh
 
       # LFS
@@ -154,6 +157,7 @@ jobs:
           ref: test-data/v2/submodule-ssh-url
           path: submodules-false
       - name: Verify submodules false
+        shell: bash
         run: __test__/verify-submodules-false.sh
 
       # Submodules one level
@@ -165,6 +169,7 @@ jobs:
           path: submodules-true
           submodules: true
       - name: Verify submodules true
+        shell: bash
         run: __test__/verify-submodules-true.sh
 
       # Submodules recursive
@@ -176,6 +181,7 @@ jobs:
           path: submodules-recursive
           submodules: recursive
       - name: Verify submodules recursive
+        shell: bash
         run: __test__/verify-submodules-recursive.sh
 
       # Basic checkout using REST API
@@ -199,10 +205,11 @@ jobs:
           ref: test-data/v2/basic
           path: basic
       - name: Verify basic
+        shell: bash
         run: __test__/verify-basic.sh --archive
 
   test-proxy:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     container:
       image: ghcr.io/actions/test-ubuntu-git:main.20240221.114913.703z
       options: --dns 127.0.0.1
@@ -243,7 +250,7 @@ jobs:
         run: __test__/verify-basic.sh --archive
 
   test-bypass-proxy:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     env:
       https_proxy: http://no-such-proxy:3128
       no_proxy: api.github.com,github.com
@@ -277,7 +284,7 @@ jobs:
         run: __test__/verify-basic.sh --archive
 
   test-git-container:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     container: bitnami/git:latest
     steps:
       # Clone this repo
@@ -316,7 +323,7 @@ jobs:
           path: localClone
 
   test-output:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       # Clone this repo
       - name: Checkout
diff --git a/.github/workflows/update-main-version.yml b/.github/workflows/update-main-version.yml
index b3b23fe..0d55503 100644
--- a/.github/workflows/update-main-version.yml
+++ b/.github/workflows/update-main-version.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   tag:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
     # Note this update workflow can also be used as a rollback tool.
     # For that reason, it's best to pin `actions/checkout` to a known, stable version
diff --git a/.github/workflows/update-test-ubuntu-git.yml b/.github/workflows/update-test-ubuntu-git.yml
index 10e4dac..e8dcf4a 100644
--- a/.github/workflows/update-test-ubuntu-git.yml
+++ b/.github/workflows/update-test-ubuntu-git.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build-and-push-image:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
       contents: read
@@ -48,7 +48,7 @@ jobs:
 
       # Use `docker/build-push-action` to build (and optionally publish) the image. 
       - name: Build Docker Image (with optional Push)
-        uses: docker/build-push-action@v6.5.0
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           file: images/test-ubuntu-git.Dockerfile
diff --git a/__test__/override-git-version.cmd b/__test__/override-git-version.cmd
index 64c7f4d..25124c9 100755
--- a/__test__/override-git-version.cmd
+++ b/__test__/override-git-version.cmd
@@ -2,5 +2,5 @@
 mkdir override-git-version
 cd override-git-version
 echo @echo override git version 1.2.3 > git.cmd
-echo "%CD%" >> $GITHUB_PATH
+echo %CD%>> "%GITHUB_PATH%"
 cd ..