diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
index f212fd0..f5b73ca 100644
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -7,15 +7,33 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
     defaults:
       run:
         shell: bash
 
     strategy:
       matrix:
-        compiler: [clang++-13, clang++-14, clang++-15, g++-10, g++-11, g++-12]
+        os: [ubuntu-20.04, ubuntu-22.04]
+        compiler: [g++-10]
+        include:
+            - os: ubuntu-20.04
+              compiler: clang++-10
+            - os: ubuntu-20.04
+              compiler: clang++-11
+            - os: ubuntu-20.04
+              compiler: clang++-12
+            - os: ubuntu-22.04
+              compiler: clang++-13
+            - os: ubuntu-22.04
+              compiler: clang++-14
+            - os: ubuntu-22.04
+              compiler: clang++-15
+            - os: ubuntu-22.04
+              compiler: g++-11
+            - os: ubuntu-22.04
+              compiler: g++-12
+    
+    runs-on: ${{matrix.os}}
 
     steps:
     - uses: actions/checkout@v4
@@ -36,6 +54,9 @@ jobs:
         do
           for build_type in Debug Release
           do
+            echo "================================================================================="
+            echo "Building C++" $cpp_standard " in " $build_type " mode on " ${{matrix.os}} " with " ${{matrix.compiler}}
+            echo "================================================================================="
             cmake -B build/$cpp_standard/$build_type -GNinja \
               -DVULKAN_HPP_SAMPLES_BUILD=ON                  \
               -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON     \
@@ -53,10 +74,12 @@ jobs:
 
     - name: Loop over build_types (Debug, Release) with cpp_standard 23 for compilers supporting that
       run: |
-        # g++-10 does not support C++23
-        if [ ${{matrix.compiler}} != g++-10 ]
+        if [[ ${{matrix.compiler}} != clang++-10 && ${{matrix.compiler}} != clang++-11 && ${{matrix.compiler}} != g++-10 ]]
         then
           cpp_standard=23
+          echo "================================================================================="
+          echo "Building C++" $cpp_standard " in " $build_type " mode on " ${{matrix.os}} " with " ${{matrix.compiler}}
+          echo "================================================================================="
           for build_type in Debug Release
           do
             cmake -B build/$cpp_standard/$build_type -GNinja \