diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index b6dba89c..52d8d6ea 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -10,12 +10,13 @@ jobs:
   linux:
     strategy:
       matrix:
-        config: [Release, Debug]
+        os: [ubuntu-24.04, ubuntu-22.04]
         pg: [17, 16, 15, 14, 13]
+        config: [Release, Debug]
 
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
 
-    name: linux 🐘${{ matrix.pg }} (${{ matrix.config }})
+    name: ${{ matrix.os }} 🐘${{ matrix.pg }} (${{ matrix.config }})
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index c360e7e7..6386bc84 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -10,12 +10,13 @@ jobs:
   macos:
     strategy:
       matrix:
-        config: [Release, Debug]
+        os: [macos-13]
         pg: [17, 16, 15, 14, 13]
+        config: [Release, Debug]
 
-    runs-on: macos-13
+    runs-on: ${{ matrix.os }}
 
-    name: macos 🐘${{ matrix.pg }} (${{ matrix.config }})
+    name: ${{ matrix.os }} 🐘${{ matrix.pg }} (${{ matrix.config }})
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +43,10 @@ jobs:
         if: ${{ matrix.pg >= 15 }}
 
       - name: Generate
-        run: VERBOSE=true cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config }}
+        run: cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config }}
+        env:
+          # Fixes missing libintl.h on some runners
+          CFLAGS: "-I /usr/local/include"
 
       - name: Build
         run: cmake --build build --config ${{ matrix.config }}
diff --git a/cmake/FindPostgreSQL.cmake b/cmake/FindPostgreSQL.cmake
index 691cafbb..90e3aa66 100644
--- a/cmake/FindPostgreSQL.cmake
+++ b/cmake/FindPostgreSQL.cmake
@@ -64,8 +64,6 @@ set(PostgreSQL_LINK_FLAGS "")
 if(APPLE)
   find_program(PostgreSQL_EXECUTABLE postgres REQUIRED NO_DEFAULT_PATH PATHS ${PostgreSQL_BIN_DIR})
   set(PostgreSQL_LINK_FLAGS "-bundle_loader ${PostgreSQL_EXECUTABLE}")
-  # @TODO: Is it possible to remove this and use a cmake flag instead?
-  list(APPEND PostgreSQL_INCLUDE_DIRS "/usr/local/include")
 endif()
 
 # ----------------------------------------------------------------------------