diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 8c3afde35d94..aa822c07ed56 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -384,6 +384,11 @@ jobs:
     needs: pack
     if: needs.pack.outputs.c-code-changes
 
+    strategy:
+      matrix:
+        flavor: [jit, emu]
+      fail-fast: false
+
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4.2.2
       - uses: ./.github/actions/build-base-image
@@ -392,7 +397,7 @@ jobs:
       - name: Build Erlang/OTP flavors and types
         run: |
             TYPES="opt debug lcnt asan gcov valgrind"
-            FLAVORS="emu jit"
+            FLAVORS="${{ matrix.flavor }}"
             for TYPE in ${TYPES}; do
               for FLAVOR in ${FLAVORS}; do
                 echo "::group::{TYPE=$TYPE FLAVOR=$FLAVOR}"
@@ -404,12 +409,14 @@ jobs:
               done
             done
       - name: Build Erlang/OTP JIT Win32 ABI
+        if: ${{ matrix.flavor == 'jit' }}
         run: >
             docker run otp './configure CFLAGS="$CFLAGS -DERTS_JIT_ABI_WIN32=1" &&
                  make && make TYPE=debug &&
                  cerl -noshell -s init stop && cerl -debug -noshell -s init stop'
 
       - name: Build Erlang/OTP with LTTNG
+        if: ${{ matrix.flavor == 'jit' }}
         run: >
             docker run otp 'sudo apt-get install -y lttng-tools &&
                  ./configure --enable-dynamic-trace=lttng &&
@@ -417,6 +424,7 @@ jobs:
                  cerl -noshell -s init stop && cerl -debug -noshell -s init stop'
 
       - name: Start Erlang with various start options
+        if: ${{ matrix.flavor == 'jit' }}
         run: |
             OPTIONS=("+JPperf true" "+JMsingle true" "+JDdump true")
             for OPTION in "${OPTIONS[@]}"; do