diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fd96669..1de2905 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -31,11 +31,13 @@ jobs:
           - { os: 'focal', tag: 'gcc-8',  extras: 'g++-8' }
           - { os: 'focal', tag: 'gcc-7',  extras: 'g++-7' }
 
-          - { os: 'noble', tag: 'clang-21',  extras: 'llvm-21' }
-          - { os: 'jammy', tag: 'clang-20',  extras: 'llvm-20' }
-          - { os: 'jammy', tag: 'clang-19',  extras: 'llvm-19' }
-          - { os: 'jammy', tag: 'clang-18',  extras: 'llvm-18' }
-          - { os: 'jammy', tag: 'clang-17',  extras: 'llvm-17' }
+          - { os: 'noble', tag: 'clang-22',  extras: 'llvm-22' }
+          # clang-21/llvm-21 packages are not found now.
+          # - { os: 'noble', tag: 'clang-21',  extras: 'llvm-21' }
+          - { os: 'noble', tag: 'clang-20',  extras: 'llvm-20' }
+          - { os: 'noble', tag: 'clang-19',  extras: 'llvm-19' }
+          - { os: 'noble', tag: 'clang-18',  extras: 'llvm-18' }
+          - { os: 'noble', tag: 'clang-17',  extras: 'llvm-17' }
           - { os: 'jammy', tag: 'clang-16',  extras: 'llvm-16' }
           - { os: 'jammy', tag: 'clang-15',  extras: 'llvm-15' }
           - { os: 'jammy', tag: 'clang-14',  extras: 'llvm-14' }
diff --git a/assets/99jammy.list b/assets/99jammy.list
index d775175..6be07e5 100644
--- a/assets/99jammy.list
+++ b/assets/99jammy.list
@@ -4,10 +4,6 @@ deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/
 deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
 deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
 deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
-deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
-deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
-deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
-deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main
 deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
 
 deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
@@ -16,8 +12,4 @@ deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.
 deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
 deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
 deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
-deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
-deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
-deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
-deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main
 deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
diff --git a/assets/99noble.list b/assets/99noble.list
index 71d50c7..a8d7013 100644
--- a/assets/99noble.list
+++ b/assets/99noble.list
@@ -1,7 +1,17 @@
 deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu noble main
 deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu noble main
+deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
+deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
+deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
+deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
+deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main
 deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble main
 
 deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu noble main
 deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu noble main
+deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
+deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
+deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
+deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
+deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main
 deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble main