diff --git a/.gitmodules b/.gitmodules
index 8617643a12029..66c69f4f64038 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,8 +24,8 @@
 	shallow = true
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/21.1-2025-08-01
+	url = https://github.com/nikic/llvm-project.git
+	branch = rust-llvm-22
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
diff --git a/src/ci/docker/scripts/build-clang.sh b/src/ci/docker/scripts/build-clang.sh
index 905c407730429..67a3253dec44c 100755
--- a/src/ci/docker/scripts/build-clang.sh
+++ b/src/ci/docker/scripts/build-clang.sh
@@ -5,7 +5,8 @@ set -ex
 source shared.sh
 
 # Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh
-LLVM=llvmorg-21.1.0-rc2
+#LLVM=llvmorg-21.1.0-rc2
+LLVM=9e78d8a4fb0739455ecdfd1751b347fbd7038c13
 
 mkdir llvm-project
 cd llvm-project
diff --git a/src/llvm-project b/src/llvm-project
index 00d23d10dc48c..b9e038f10e9df 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 00d23d10dc48c6bb9d57ba96d4a748d85d77d0c7
+Subproject commit b9e038f10e9df2e344143af45217965707758d9a