diff --git a/.github/workflows/build-tool-packages.yml b/.github/workflows/build-tool-packages.yml
index 75c16f9..d250524 100644
--- a/.github/workflows/build-tool-packages.yml
+++ b/.github/workflows/build-tool-packages.yml
@@ -107,26 +107,41 @@ jobs:
     name: Test ${{ inputs.tool-name }} ${{ inputs.tool-version }} [${{ matrix.platform }}]
     needs: build
     runs-on: ${{ matrix.os }}
+    env: 
+      ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-x64
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-14-large, windows-latest]
-        platform: [linux, darwin, win32]
+        include:
+        - os: ubuntu-latest
+          platform: linux
+        - os: macos-latest
+          platform: darwin
+        - os: windows-latest
+          platform: win32
     steps:
-    - name: Get architecture
-      id: get-arch
-      run: echo "::set-output name=architecture::$(uname -m)"
-      shell: bash
-
-    - name: Build
-      env:
-        ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-${{ steps.get-arch.outputs.architecture }}
     - uses: actions/checkout@v3
       with:
-        submodules: true
+         submodules: true
 
     - name: Fully cleanup the toolcache directory before testing
       run: ./helpers/clean-toolcache.ps1 -ToolName "${{ inputs.tool-name }}"
 
+       
+    - name: Get architecture
+      id: get-arch
+      shell: bash
+      run: |
+        if [[ "${{ matrix.platform }}" == "darwin" ]]; then
+          echo "ARCH=$(uname -m)" >> $GITHUB_ENV
+        else
+          echo "ARCH=x64" >> $GITHUB_ENV
+        fi
+
+    - name: Set env
+      run: echo "ARTIFACT_NAME=${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-$ARCH" >> $GITHUB_ENV
+
+
     - name: Download artifact
       uses: actions/download-artifact@v3
       with: