diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe757ebf..39202b96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,19 +21,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu22-gcc12-clang17
+          - name: ubu22-x86-gcc12-clang17
             os: ubuntu-22.04
             compiler: gcc-12
             clang-runtime: '17'
             cling: Off
             cppyy: On
-          - name: ubu22-gcc12-clang16
+          - name: ubu22-x86-gcc12-clang16
             os: ubuntu-22.04
             compiler: gcc-12
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          - name: ubu22-gcc12-cling
+          - name: ubu22-x86-gcc12-cling
             os: ubuntu-22.04
             compiler: gcc-12
             clang-runtime: '13'
@@ -42,38 +42,38 @@ jobs:
             cppyy: On
           - name: osx13-x86-clang-clang17
             os: macos-13
-            compiler: clang
+            compiler: clang-17
             clang-runtime: '17'
             cling: Off
             cppyy: On
           - name: osx13-x86-clang-clang16
             os: macos-13
-            compiler: clang
+            compiler: clang-17
             clang-runtime: '16'
             cling: Off
             cppyy: On
           - name: os13-x86-clang-cling
             os: macos-13
-            compiler: gcc-12
+            compiler: clang-17
             clang-runtime: '13'
             cling: On
             cling-version: '1.0'
             cppyy: On
           - name: osx14-arm-clang-clang17
             os: macos-14
-            compiler: clang
+            compiler: clang-17
             clang-runtime: '17'
             cling: Off
             cppyy: On
           - name: osx14-arm-clang-clang16
             os: macos-14
-            compiler: clang
+            compiler: clang-17
             clang-runtime: '16'
             cling: Off
             cppyy: On
           - name: os14-arm-clang-cling
             os: macos-14
-            compiler: gcc-12
+            compiler: clang-17
             clang-runtime: '13'
             cling: On
             cling-version: '1.0'
@@ -157,12 +157,12 @@ jobs:
           echo "CC=gcc-${vers}" >> $GITHUB_ENV
           echo "CXX=g++-${vers}" >> $GITHUB_ENV
         else
-          
+          brew install llvm@${vers}
           #Use clang-15 and clang++-15 compiler that is installed on runner, instead of one
           #provided by MacOS (could brew install clang-16/17 to use consistent version
           #of clang)
-          echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
-          echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
+          echo "CC=$(brew --prefix llvm@17)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@17)/bin/clang++" >> $GITHUB_ENV
         fi
       env:
         compiler: ${{ matrix.compiler }}