diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bcdd4fc..aa12e32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,10 +103,16 @@ jobs:
             install:
               - g++-13
           - toolset: gcc-14
-            cxxstd: "11,14,17,20,23"
+            cxxstd: "11,14,17,20,23,26"
             os: ubuntu-24.04
             install:
               - g++-14
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,26"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install:
+              - g++-15
           - name: UBSAN
             toolset: gcc-13
             cxxstd: "11,14,17,20,23"
@@ -260,33 +266,33 @@ jobs:
             gcc_toolchain: 11
           - toolset: clang
             compiler: clang++-18
-            cxxstd: "11,14,17,20,23"
+            cxxstd: "11,14,17,20,23,26"
             os: ubuntu-24.04
             install:
               - clang-18
               - g++-13
           - toolset: clang
             compiler: clang++-19
-            cxxstd: "11,14,17,20,23"
+            cxxstd: "11,14,17,20,23,26"
             os: ubuntu-24.04
             install:
               - clang-19
-            sources:
-              - "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
-            source_keys:
-              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
           - toolset: clang
-            compiler: clang++-19
-            cxxstd: "11,14,17,20,23"
-            os: ubuntu-24.04
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,26"
+            os: ubuntu-latest
+            container: ubuntu:25.04
             install:
-              - clang-19
-              - libc++-19-dev
-              - libc++abi-19-dev
-            sources:
-              - "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
-            source_keys:
-              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
+              - clang-20
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,26"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install:
+              - clang-20
+              - libc++-20-dev
+              - libc++abi-20-dev
             cxxflags: -stdlib=libc++
             linkflags: -stdlib=libc++
           - name: UBSAN