diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6ae52eb..b0e7437 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
@@ -31,7 +31,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
diff --git a/.github/workflows/code-coverage.yaml b/.github/workflows/code-coverage.yaml
index 57fe37c..0e3ba26 100644
--- a/.github/workflows/code-coverage.yaml
+++ b/.github/workflows/code-coverage.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index d33e767..43ac3ad 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -18,7 +18,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+      - name: Build and Run Unit Tests
+        run: bazel test --test_output=all //...
+  Linux-ARM64:
+    runs-on: archonite-linux-arm64
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Bazel
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
@@ -31,7 +44,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
@@ -44,12 +57,28 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.8.2
+        uses: bazel-contrib/setup-bazel@0.8.5
         with:
           bazelisk-cache: true
           disk-cache: ${{ github.workflow }}
           repository-cache: true
       - name: Build and Run Unit Tests
-        # extra slash is an intentional hack, powershell converts a // to /
-        run: bazel test --test_output=all ///...
-        shell: bash
+        run: bazel test --test_output=all //...
+        shell: cmd
+  # Disabled until the following are resolved:
+  # https://github.com/bazel-contrib/setup-bazel/issues/25
+  # https://github.com/bazelbuild/bazelisk/issues/572
+  #Windows-ARM64:
+  #  runs-on: archonite-windows-arm64
+  #  steps:
+  #    - name: Checkout
+  #      uses: actions/checkout@v4
+  #    - name: Setup Bazel
+  #      uses: bazel-contrib/setup-bazel@0.8.5
+  #      with:
+  #        bazelisk-cache: true
+  #        disk-cache: ${{ github.workflow }}
+  #        repository-cache: true
+  #    - name: Build and Run Unit Tests
+  #      run: bazel test --test_output=all //...
+  #      shell: cmd