diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml
index 1863582fc..d3df35ac2 100644
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -1,4 +1,3 @@
-
 name: Merge Queue
 # Not sure how concurrency works in merge_queue, removing for now.
 # concurrency:
@@ -11,7 +10,6 @@ on:
 env:
   FAIL_FAST_PER_ARCH: true
 
-
 jobs:
   setup:
     strategy:
@@ -90,7 +88,7 @@ jobs:
   build-esp32:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.esp32) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -101,7 +99,7 @@ jobs:
   build-esp32s3:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.esp32s3) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -112,7 +110,7 @@ jobs:
   build-esp32c3:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.esp32c3) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -123,7 +121,7 @@ jobs:
   build-esp32c6:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -134,7 +132,7 @@ jobs:
   build-nrf52840:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.nrf52840) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -145,7 +143,7 @@ jobs:
   build-rp2040:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.rp2040) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -156,7 +154,7 @@ jobs:
   build-rp2350:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.rp2350) }}
     uses: ./.github/workflows/build_firmware.yml
     with:
@@ -167,7 +165,7 @@ jobs:
   build-stm32:
     needs: [setup, version]
     strategy:
-      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
+      fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
       matrix: ${{ fromJson(needs.setup.outputs.stm32) }}
     uses: ./.github/workflows/build_firmware.yml
     with: