diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
index b3737b6..68bb7ba 100644
--- a/.github/workflows/ci-ubuntu.yml
+++ b/.github/workflows/ci-ubuntu.yml
@@ -8,21 +8,20 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    
+
+    defaults:
+      run:
+        shell: bash
+
     strategy:
       matrix:
-        build_type: [Debug, Release]
         compiler: [clang++-13, clang++-14, g++-9, g++-10, g++-11]
-        cxx_standard: [11, 14, 17, 20]
-        include:
-          - compiler: g++-11
-            cxx_standard: 23
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
-    
+
     - name: Install libraries
       run: sudo apt update && sudo apt install libgl-dev libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev
 
@@ -30,19 +29,47 @@ jobs:
       uses: ashutoshvarma/setup-ninja@master
       with:
         version: 1.11.0
-      
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -GNinja
-            -DVULKAN_HPP_SAMPLES_BUILD=ON
-            -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON
-            -DVULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-            -DVULKAN_HPP_TESTS_BUILD=ON
-            -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON
-            -DVULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-            -DVULKAN_HPP_RUN_GENERATOR=ON
-            -DCMAKE_CXX_COMPILER=${{matrix.compiler}}
-            -DCMAKE_CXX_STANDARD=${{matrix.cxx_standard}}
-            -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
-            
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --parallel
+
+    - name: Loop over cpp_standards (11, 14, ...) and build_types (Debug, Release)
+      run: |
+        for cpp_standard in 11 14 17 20
+        do
+          for build_type in Debug Release
+          do
+            cmake -B build/$cpp_standard/$build_type -GNinja \
+              -DVULKAN_HPP_SAMPLES_BUILD=ON                  \
+              -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON     \
+              -DVULKAN_HPP_TESTS_BUILD=ON                    \
+              -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON       \
+              -DVULKAN_HPP_BUILD_WITH_LOCAL_VULKAN_HPP=ON    \
+              -DVULKAN_HPP_PRECOMPILE=OFF                    \
+              -DVULKAN_HPP_RUN_GENERATOR=ON                  \
+              -DCMAKE_CXX_COMPILER=${{matrix.compiler}}      \
+              -DCMAKE_CXX_STANDARD=$cpp_standard             \
+              -DCMAKE_BUILD_TYPE=$build_type
+            cmake --build build/$cpp_standard/$build_type --parallel
+          done
+        done
+
+    - name: Loop over build_types (Debug, Release) with cpp_standard 23 for g++-11 only
+      run: |
+        if [ ${{matrix.compiler}} == g++-11 ]
+        then
+          cpp_standard=23
+          for build_type in Debug Release
+          do
+            cmake -B build/$cpp_standard/$build_type -GNinja \
+              -DVULKAN_HPP_SAMPLES_BUILD=ON                  \
+              -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON     \
+              -DVULKAN_HPP_TESTS_BUILD=ON                    \
+              -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON       \
+              -DVULKAN_HPP_BUILD_WITH_LOCAL_VULKAN_HPP=ON    \
+              -DVULKAN_HPP_PRECOMPILE=OFF                    \
+              -DVULKAN_HPP_RUN_GENERATOR=ON                  \
+              -DCMAKE_CXX_COMPILER=${{matrix.compiler}}      \
+              -DCMAKE_CXX_STANDARD=$cpp_standard             \
+              -DCMAKE_BUILD_TYPE=$build_type
+            cmake --build build/$cpp_standard/$build_type --parallel
+          done
+        fi
+