diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index e247acc34..ed6610522 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -38,22 +38,24 @@ jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
-        compiler: [ g++-10, g++-11, g++-12, clang++-10, clang++-11, clang++-12 ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
+        compiler: [ g++-11, g++-12, g++-13, clang++-14, clang++-15, clang++-16 ]
         exclude:
-          - os: ubuntu-20.04
-            compiler: g++-11
-          - os: ubuntu-20.04
-            compiler: g++-12
-          - os: ubuntu-22.04
-            compiler: clang++-10
-        include:
           - os: ubuntu-22.04
-            compiler: clang++-13
+            compiler: g++-13
           - os: ubuntu-22.04
+            compiler: clang++-16
+          - os: ubuntu-24.04
             compiler: clang++-14
+        include:
           - os: ubuntu-22.04
-            compiler: clang++-15
+            compiler: g++-10
+          - os: ubuntu-24.04
+            compiler: g++-14
+          - os: ubuntu-24.04
+            compiler: clang++-17
+          - os: ubuntu-24.04
+            compiler: clang++-18
           - os: ubuntu-20.04
             compiler: g++-10
             cppstandard: -DCMAKE_CXX_STANDARD=20