diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78e5315..90fe1a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,8 +27,8 @@ jobs:
           - { os: ubuntu-24.04,   llvm: '22', flavor: '',     py: '3.14', cxx: '20' }
           - { os: macos-26,       llvm: '21', flavor: system, py: '3.14', cxx: '20' }
           - { os: macos-26-intel, llvm: '21', flavor: system, py: '3.14', cxx: '20' }
-          # cling backend, against the cached llvm-root (cling-llvm20) recipe cell.
-          - { os: ubuntu-24.04,   llvm: '20', flavor: cling,  flavor_version: cling-llvm20, py: '3.14', cxx: '20' }
+          # cling backend, against the cached llvm-root (cling-llvm22) recipe cell.
+          - { os: ubuntu-24.04,   llvm: '22', flavor: cling,  flavor_version: cling-llvm22, py: '3.14', cxx: '20' }
     uses: compiler-research/ci-workflows/.github/workflows/cppjit.yml@main
     with:
       # CppInterOp is pinned in CppJIT's cmake to a commit compatible
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 424a0f8..88d40d6 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -39,8 +39,8 @@ jobs:
           - { os: ubuntu-24.04-arm, llvm: '20', flavor: system, py: '3.12', cxx: '17' }
           - { os: macos-26,         llvm: '21', flavor: system, py: '3.12', cxx: '20' }
           - { os: macos-26-intel,   llvm: '21', flavor: system, py: '3.12', cxx: '20' }
-          # cling backend, against the cached llvm-root (cling-llvm20) recipe cell.
-          - { os: ubuntu-24.04,     llvm: '20', flavor: cling,  flavor_version: cling-llvm20, py: '3.13', cxx: '20' }
+          # cling backend, against the cached llvm-root (cling-llvm22) recipe cell.
+          - { os: ubuntu-24.04,     llvm: '22', flavor: cling,  flavor_version: cling-llvm22, py: '3.13', cxx: '20' }
     uses: compiler-research/ci-workflows/.github/workflows/cppjit.yml@main
     with:
       # For upstream-drift detection, set cppinterop-ref: main here.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f9c414..635ad97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ include(GNUInstallDirs)
 # Perhaps this should permanently be OFF and users can build their own CppInterOp if they want to run the tests?
 option(CPPJIT_ENABLE_CPPINTEROP_TESTS "enable CppInterOp tests" OFF)
 set(CPPINTEROP_GIT_REPOSITORY "https://github.com/compiler-research/CppInterOp.git" CACHE STRING "")
-set(CPPINTEROP_GIT_TAG "3103be92baa66a5e78e3a7c6207d83d4623ca956" CACHE STRING "")
+set(CPPINTEROP_GIT_TAG "8d624c621a4b95e36ff73ac708c85a768287478f" CACHE STRING "")
 
 set(Python_FIND_VIRTUALENV ONLY)
 find_package(Python COMPONENTS Interpreter Development)