diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf3c9631..23453cac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,18 +21,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: ubu22-x86-gcc12-clang17
-            os: ubuntu-22.04
-            compiler: gcc-12
-            clang-runtime: '17'
-            cling: Off
-            cppyy: On
-          - name: ubu22-x86-gcc12-clang16
-            os: ubuntu-22.04
-            compiler: gcc-12
-            clang-runtime: '16'
-            cling: Off
-            cppyy: On
+          #- name: ubu22-x86-gcc12-clang17
+          #  os: ubuntu-22.04
+          #  compiler: gcc-12
+          #  clang-runtime: '17'
+          #  cling: Off
+          #  cppyy: On
+          #- name: ubu22-x86-gcc12-clang16
+          #  os: ubuntu-22.04
+          #  compiler: gcc-12
+          #  clang-runtime: '16'
+          #  cling: Off
+          #  cppyy: On
           - name: ubu22-x86-gcc12-cling
             os: ubuntu-22.04
             compiler: gcc-12
@@ -40,18 +40,18 @@ jobs:
             cling: On
             cling-version: '1.0'
             cppyy: On
-          - name: osx13-x86-clang-clang17
-            os: macos-13
-            compiler: clang
-            clang-runtime: '17'
-            cling: Off
-            cppyy: On
-          - name: osx13-x86-clang-clang16
-            os: macos-13
-            compiler: clang
-            clang-runtime: '16'
-            cling: Off
-            cppyy: On
+          #- name: osx13-x86-clang-clang17
+          #  os: macos-13
+          #  compiler: clang
+          #  clang-runtime: '17'
+          #  cling: Off
+          #  cppyy: On
+          #- name: osx13-x86-clang-clang16
+          #  os: macos-13
+          #  compiler: clang
+          #  clang-runtime: '16'
+          #  cling: Off
+          #  cppyy: On
           - name: osx13-x86-clang-cling
             os: macos-13
             compiler: clang
@@ -59,18 +59,18 @@ jobs:
             cling: On
             cling-version: '1.0'
             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
-            compiler: clang
-            clang-runtime: '16'
-            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
+          #  compiler: clang
+          #  clang-runtime: '16'
+          #  cling: Off
+          #  cppyy: On
           - name: osx14-arm-clang-cling
             os: macos-14
             compiler: clang
@@ -369,7 +369,7 @@ jobs:
           cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}        \
                 -DUSE_CLING=ON                                  \
                 -DUSE_REPL=OFF                                  \
-                -DCling_DIR=$LLVM_BUILD_DIR/tools/cling         \
+                -DCling_DIR=$LLVM_BUILD_DIR        \
                 -DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm       \
                 -DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm      \
                 -DBUILD_SHARED_LIBS=ON                          \