diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50c4ac6e1..f1fbd8724 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,11 +32,59 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lib_type: [shared, static]
-        # Can't test DB2 as required db2exc package is no longer available after Ubuntu 14.04
-        backend: [SQLite3, PostgreSQL, MySQL, Firebird, Oracle, ODBC, Empty, Valgrind]
-        runner: [ubuntu-22.04]
         include:
+            # Ubuntu jobs
+            # Can't test DB2 as required db2exc package is no longer available after Ubuntu 14.04
+          - lib_type: shared
+            backend: SQLite3
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: PostgreSQL
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: MySQL
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: Firebird
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: Oracle
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: ODBC
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: Empty
+            runner: ubuntu-22.04
+          - lib_type: shared
+            backend: Valgrind
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: SQLite3
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: PostgreSQL
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: MySQL
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: Firebird
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: Oracle
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: ODBC
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: Empty
+            runner: ubuntu-22.04
+          - lib_type: static
+            backend: Valgrind
+            runner: ubuntu-22.04
+
+            # MacOS jobs
           - lib_type: shared
             backend: Empty
             runner: macos-14
@@ -49,6 +97,8 @@ jobs:
             backend: SQLite3
             runner: macos-14
             no_boost: true
+
+            # Special
           - lib_type: shared
             backend: Oracle
             runner: ubuntu-22.04