diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index dc0070b83..8defcc4c5 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -177,14 +177,14 @@
         "license_file": "LICENSE.libxcb.txt",
     },
     # Remember to update LLVM_URL in src/release.rs whenever upgrading.
-    "llvm-21-aarch64-linux": {
+    "llvm-aarch64-linux": {
         "url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-gnu_only-aarch64-unknown-linux-gnu.tar.zst",
         "size": 237665010,
         "sha256": "0f7ef68a9d6239336aa073366edd5377a47192c32d40c96ff72b416a15259999",
         "version": "22.1.1+20260312",
     },
     # Remember to update LLVM_URL in src/release.rs whenever upgrading.
-    "llvm-21-x86_64-linux": {
+    "llvm-x86_64-linux": {
         "url": "https://github.com/indygreg/toolchain-tools/releases/download/toolchain-bootstrap%2F20260312/llvm-22.1.1+20260312-gnu_only-x86_64-unknown-linux-gnu.tar.zst",
         "size": 281108139,
         "sha256": "2a2f2e51bb9c621c6b00a42d8349f27edcb3aacaa750040000ac95a0298e97c1",
diff --git a/pythonbuild/utils.py b/pythonbuild/utils.py
index 47640b6b5..91d9fff5b 100644
--- a/pythonbuild/utils.py
+++ b/pythonbuild/utils.py
@@ -474,9 +474,9 @@ def sort_key(v):
 
 def clang_toolchain(host_platform: str, target_triple: str) -> str:
     if host_platform == "linux_x86_64":
-        return "llvm-21-x86_64-linux"
+        return "llvm-x86_64-linux"
     elif host_platform == "linux_aarch64":
-        return "llvm-21-aarch64-linux"
+        return "llvm-aarch64-linux"
     elif host_platform == "macos_arm64":
         return "llvm-aarch64-macos"
     elif host_platform == "macos_x86_64":