diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index 0fa50f11890..2593574aad5 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -43,11 +43,17 @@ jobs:
           - "-DFLB_SANITIZE_MEMORY=On"
           - "-DFLB_SANITIZE_THREAD=On"
         compiler:
-          - gcc
-          - clang
+          - gcc:
+            cc: gcc
+            cxx: g++
+          - clang:
+            cc: clang
+            cxx: clang++
         exclude:
           - flb_option: "-DFLB_COVERAGE=On"
-            compiler: clang
+            compiler:
+              cc: clang
+              cxx: clang++
     permissions:
       contents: read
     steps:
@@ -64,7 +70,7 @@ jobs:
           repository: calyptia/fluent-bit-ci
           path: ci
 
-      - name: ${{ matrix.compiler }} - ${{ matrix.flb_option }}
+      - name: ${{ matrix.compiler.cc }} & ${{ matrix.compiler.cxx }} - ${{ matrix.flb_option }}
         run: |
           echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT"
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90
@@ -73,8 +79,8 @@ jobs:
           sudo usermod -a -G systemd-journal $(id -un)
           sudo -E su -p $(id -un) -c "PATH=$PATH ci/scripts/run-unit-tests.sh"
         env:
-          CC: ${{ matrix.compiler }}
-          CXX: ${{ matrix.compiler }}
+          CC: ${{ matrix.compiler.cc }}
+          CXX: ${{ matrix.compiler.cxx }}
           FLB_OPT: ${{ matrix.flb_option }}
 
   run-macos-unit-tests:
@@ -128,7 +134,9 @@ jobs:
             omit_option: "-DFLB_WITHOUT_flb-it-utils=1 -DFLB_WITHOUT_flb-it-pack=1"
             global_option: "-DFLB_BACKTRACE=Off -DFLB_SHARED_LIB=Off -DFLB_DEBUG=On -DFLB_ALL=On -DFLB_EXAMPLES=Off"
             unit_test_option: "-DFLB_TESTS_INTERNAL=On"
-            compiler: gcc
+            compiler:
+              cc: gcc
+              cxx: g++
     steps:
       - name: Checkout Fluent Bit code
         uses: actions/checkout@v4
@@ -163,8 +171,8 @@ jobs:
             ctest -j $nparallel --build-run-dir . --output-on-failure
         working-directory: build
         env:
-          CC: ${{ matrix.config.compiler }}
-          CXX: ${{ matrix.config.compiler }}
+          CC: ${{ matrix.config.compiler.cc }}
+          CXX: ${{ matrix.config.compiler.cxx }}
 
   run-qemu-ubuntu-unit-tests:
     # We chain this after Linux one as there are CPU time costs for QEMU emulation
@@ -208,7 +216,7 @@ jobs:
             export FLB_UNIT_TEST_OPTION="-DFLB_TESTS_INTERNAL=On"
             export FLB_OPT="${FLB_OPTION} ${GLOBAL_OPTION} ${FLB_UNIT_TEST_OPTION} ${FLB_OMIT_OPTION}"
             export CC=gcc
-            export CXX=gcc
+            export CXX=g++
 
             echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT"