diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f6cbeb..b857859 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,9 +128,16 @@ jobs:
           - toolset: gcc-13
             cxxstd: "11,14,17,20,2b"
             os: ubuntu-latest
-            container: ubuntu:23.04
+            container: ubuntu:24.04
             install: g++-13-multilib
             address-model: 32,64
+          # Linux, gcc-14
+          - toolset: gcc-14
+            cxxstd: "11,14,17,20,2b"
+            os: ubuntu-latest
+            container: ubuntu:24.04
+            install: g++-14-multilib
+            address-model: 32,64
           # Linux, gcc-12 UBSAN
           - name: UBSAN
             toolset: gcc-12
@@ -285,16 +292,23 @@ jobs:
           - toolset: clang
             compiler: clang++-16
             cxxstd: "03,11,14,17,20,2b"
-            container: ubuntu:23.04
+            container: ubuntu:24.04
             os: ubuntu-latest
             install: clang-16
           # Linux, clang-17
           - toolset: clang
             compiler: clang++-17
             cxxstd: "03,11,14,17,20,2b"
-            container: ubuntu:23.10
+            container: ubuntu:24.04
             os: ubuntu-latest
             install: clang-17
+          # Linux, clang-18
+          - toolset: clang
+            compiler: clang++-18
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-18
           # Linux, clang-15 libc++
           - toolset: clang
             compiler: clang++-15
@@ -304,10 +318,17 @@ jobs:
               - clang-15
               - libc++-15-dev
               - libc++abi-15-dev
-            sources:
-              - "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
-            source_keys:
-              - "https://apt.llvm.org/llvm-snapshot.gpg.key"
+            cxxflags: -stdlib=libc++
+            linkflags: -stdlib=libc++
+          # Linux, clang-18 libc++
+          - toolset: clang
+            compiler: clang++-18
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-24.04
+            install:
+              - clang-18
+              - libc++-18-dev
+              - libc++abi-18-dev
             cxxflags: -stdlib=libc++
             linkflags: -stdlib=libc++
           # Linux, clang-14 libc++, ubsan
@@ -323,6 +344,19 @@ jobs:
               - clang-14
               - libc++-14-dev
               - libc++abi-14-dev
+          # Linux, clang-18 libc++, ubsan
+          - name: UBSAN
+            toolset: clang
+            compiler: clang++-18
+            cxxstd: "03,11,14,17,20"
+            cxxflags: -stdlib=libc++
+            linkflags: -stdlib=libc++
+            ubsan: 1
+            os: ubuntu-24.04
+            install:
+              - clang-18
+              - libc++-18-dev
+              - libc++abi-18-dev
           #------------------
           # MacOS, clang
           #------------------