diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 053dc415f9..ac1a49a963 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1383,7 +1383,7 @@ t:windows-borland5.8:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang21.1-cl-fastbuild:
+t:windows-clang22.1-cl-fastbuild:
     extends:
         - .windows_clang_fastbuild
         - .cmake_test_windows_external
@@ -1393,10 +1393,10 @@ t:windows-clang21.1-cl-fastbuild:
     needs:
         - t:windows-vs2026-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang21.1_cl_fastbuild
+        CMAKE_CI_BUILD_NAME: windows_clang22.1_cl_fastbuild
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang21.1-cl-ninja:
+t:windows-clang22.1-cl-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1406,10 +1406,10 @@ t:windows-clang21.1-cl-ninja:
     needs:
         - t:windows-vs2026-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang21.1_cl_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang22.1_cl_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang21.1-cl-nmake:
+t:windows-clang22.1-cl-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1419,10 +1419,10 @@ t:windows-clang21.1-cl-nmake:
     needs:
         - t:windows-vs2026-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang21.1_cl_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang22.1_cl_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang21.1-gnu-ninja:
+t:windows-clang22.1-gnu-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1432,10 +1432,10 @@ t:windows-clang21.1-gnu-ninja:
     needs:
         - t:windows-vs2026-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang21.1_gnu_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang22.1_gnu_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang21.1-gnu-nmake:
+t:windows-clang22.1-gnu-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1445,7 +1445,7 @@ t:windows-clang21.1-gnu-nmake:
     needs:
         - t:windows-vs2026-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang21.1_gnu_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang22.1_gnu_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:windows-intel2021.9-ninja:
diff --git a/.gitlab/ci/clang.ps1 b/.gitlab/ci/clang.ps1
index 327fe3ba22..20830ccc27 100644
--- a/.gitlab/ci/clang.ps1
+++ b/.gitlab/ci/clang.ps1
@@ -1,10 +1,10 @@
 $erroractionpreference = "stop"
 
-if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang21.1")) {
-    # LLVM/Clang 21.1.8
-    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-21.1.8
-    $filename = "llvm-21.1.8-win-x86_64-1"
-    $sha256sum = "3DB0063A6E434C694799CDD70052F27F08A758F1FF4B4C04D9910AD4198F6064"
+if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang22.1")) {
+    # LLVM/Clang 22.1.2
+    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-22.1.2
+    $filename = "llvm-22.1.2-win-x86_64-1"
+    $sha256sum = "31022498417A1225FABF31EE66AF11971BA2E4BA97FFE7A10F9A206CAD8A85E7"
 } else {
     throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME")
 }