diff --git a/sw-versions.sh b/sw-versions.sh
index 6fdbb3d..e3d5d25 100644
--- a/sw-versions.sh
+++ b/sw-versions.sh
@@ -8,9 +8,9 @@
 # - `.option arch` with optional 0p93 suffix
 # - fix single byte counters for elided branches
 # - revert D151768
-export LLVM_URL=https://github.com/lowRISC/llvm-project.git
-export LLVM_BRANCH=ot-llvm-21.1
-export LLVM_COMMIT=e5b282fd2541f3d1eb56b5b796b31aae3e37a293
+export LLVM_URL=https://github.com/luismarques/llvm-project.git
+export LLVM_BRANCH=ot-llvm-22.1.7
+export LLVM_COMMIT=d96ccb1505df1c7bba10a5a1f0df9c18070a6063
 
 # Our Binutils fork with unratified bitmanip extensions
 export BINUTILS_URL=https://github.com/lowRISC/binutils.git