diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6aa53320e0..36605252cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -142,8 +142,13 @@ jobs:
     needs: set-matrix
     if: github.repository_owner == 'hathach'
     runs-on: [self-hosted, Linux, X64, hifiphile]
+    strategy:
+      fail-fast: false
+      matrix:
+        toolchain:
+          - 'arm-iar'
     env:
-      BUILD_ARGS: ${{ fromJSON(needs.set-matrix.outputs.json).arm-iar.family }}
+      BUILD_ARGS: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family }}
     steps:
       - name: Clean workspace
         run: |
@@ -154,16 +159,6 @@ jobs:
       - name: Checkout TinyUSB
         uses: actions/checkout@v4
 
-      - run: |
-          echo "1"
-          BUILD_ARGS=$(echo ${{ fromJSON(needs.set-matrix.outputs.json).arm-iar.family }} | jq -R -s .)
-          echo $BUILD_ARGS
-#          echo "2"
-#          echo ${{ fromJSON(needs.set-matrix.outputs.json)['arm-iar'] }}
-#          echo "3"
-#          echo ${{ fromJSON(needs.set-matrix.outputs.json)['arm-iar'].family }}
-
-
 #      - name: Get Dependencies
 #        run: python3 tools/get_deps.py $BUILD_ARGS
 #
diff --git a/.github/workflows/hil_test.yml b/.github/workflows/hil_test.yml
index eb3f2cbabf..6a56f61de8 100644
--- a/.github/workflows/hil_test.yml
+++ b/.github/workflows/hil_test.yml
@@ -131,7 +131,7 @@ jobs:
       - build-esp
     runs-on: [self-hosted, rp2040, nrf52840, esp32s3, hardware-in-the-loop]
     env:
-        BOARDS_LIST: "${{ needs.build.outputs.BOARDS_LIST }} ${{ needs.build-esp.outputs.BOARDS_LIST }}"
+      BOARDS_LIST: "${{ needs.build.outputs.BOARDS_LIST }} ${{ needs.build-esp.outputs.BOARDS_LIST }}"
     steps:
       - name: Clean workspace
         run: |