diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd4b6ea9..f8e1b37a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,51 +33,51 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          - name: ubu22-gcc12-cling
-            os: ubuntu-22.04
-            compiler: gcc-12
-            clang-runtime: '13'
-            cling: On
-            cling-version: '1.0'
-            cppyy: On
-          #- name: osx13-x86-clang-clang17
-          #  os: macos-13
-          #  compiler: clang
-          #  clang-runtime: '17'
-          #  cling: Off
+          #- name: ubu22-gcc12-cling
+          #  os: ubuntu-22.04
+          #  compiler: gcc-12
+          #  clang-runtime: '13'
+          #  cling: On
+          #  cling-version: '1.0'
           #  cppyy: On
-          #- name: osx13-x86-clang-clang16
-          #  os: macos-13
-          #  compiler: clang
-          #  clang-runtime: '16'
-          #  cling: Off
-          #  cppyy: On
-          - name: os13-x86-clang-cling
+          - name: osx13-x86-clang-clang17
             os: macos-13
             compiler: clang
-            clang-runtime: '13'
-            cling: On
-            cling-version: '1.0'
+            clang-runtime: '17'
+            cling: Off
             cppyy: On
-          #- name: osx14-arm-clang-clang17
-          #  os: macos-14
-          #  compiler: clang
-          #  clang-runtime: '17'
-          #  cling: Off
-          #  cppyy: On
-          #- name: osx14-arm-clang-clang16
-          #  os: macos-14
+          - name: osx13-x86-clang-clang16
+            os: macos-13
+            compiler: clang
+            clang-runtime: '16'
+            cling: Off
+            cppyy: On
+          #- name: os13-x86-clang-cling
+          #  os: macos-13
           #  compiler: clang
-          #  clang-runtime: '16'
-          #  cling: Off
+          #  clang-runtime: '13'
+          #  cling: On
+          #  cling-version: '1.0'
           #  cppyy: On
-          - name: os14-arm-clang-cling
+          - name: osx14-arm-clang-clang17
             os: macos-14
             compiler: clang
-            clang-runtime: '13'
-            cling: On
-            cling-version: '1.0'
+            clang-runtime: '17'
+            cling: Off
+            cppyy: On
+          - name: osx14-arm-clang-clang16
+            os: macos-14
+            compiler: clang
+            clang-runtime: '16'
+            cling: Off
             cppyy: On
+          #- name: os14-arm-clang-cling
+          #  os: macos-14
+          #  compiler: clang
+          #  clang-runtime: '13'
+          #  cling: On
+          #  cling-version: '1.0'
+          #  cppyy: On
             
     steps:
     - uses: actions/checkout@v3
@@ -242,11 +242,10 @@ jobs:
           git apply -v ../patches/llvm/clang${{ matrix.clang-runtime }}-*.patch
           echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
           cd build
-          cmake -DLLVM_ENABLE_PROJECTS=clang                  \
-                -DLLVM_ENABLE_RUNTIMES=openmp                 \
+          cmake -DLLVM_ENABLE_PROJECTS="clang;openmp"         \
                 -DLLVM_TARGETS_TO_BUILD="host;NVPTX"          \
                 -DCMAKE_BUILD_TYPE=Release                    \
-                -DLLVM_OPTIMIZED_TABLEGEN=On                  \
+                -DLLVM_OPTIMIZED_TABLEGEN=OFF                 \
                 -DLLVM_ENABLE_ASSERTIONS=ON                   \
                 -DCLANG_ENABLE_STATIC_ANALYZER=OFF            \
                 -DCLANG_ENABLE_ARCMT=OFF                      \
@@ -255,9 +254,8 @@ jobs:
                 -DCMAKE_INSTALL_PREFIX=../inst                \
                 -DLLVM_USE_LINKER=lld                          \
                 ../llvm
-          cmake --build . --target ClangDriverOptions clang clang-repl openmp openmp-resource-headers --parallel ${{ env.ncpus }}
-          make clean -j ${{ env.ncpus }}
-          make install -j ${{ env.ncpus }}
+          cmake --build . --target all --parallel ${{ env.ncpus }}
+          cmake --build . --target install --parallel ${{ env.ncpus }}
         fi 
         cd ..
         rm -rf $(find . -maxdepth 1 ! -name "inst" ! -name ".")