diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 90830b1f80..972f0e5ce8 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -31,10 +31,10 @@ jobs:
         with:
           token: ${{ github.token }}
           filters: |
-            postgres-v14: ['vendor/postgres-v14/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
-            postgres-v15: ['vendor/postgres-v15/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
-            postgres-v16: ['vendor/postgres-v16/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
-            postgres-v17: ['vendor/postgres-v17/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
+            v14: ['vendor/postgres-v14/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
+            v15: ['vendor/postgres-v15/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
+            v16: ['vendor/postgres-v16/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
+            v17: ['vendor/postgres-v17/**', 'Makefile', '.github/workflows/build-macos.yml', 'pgxn/**']
           base: ${{ github.event_name != 'pull_request' && (github.event.merge_group.base_ref || github.ref_name) || '' }}
           ref: ${{ github.event_name != 'pull_request' && (github.event.merge_group.head_ref || github.ref) || ''}}
 
@@ -54,14 +54,22 @@ jobs:
       # Hence keeping target/ (and general cache size) smaller
       BUILD_TYPE: release
     steps:
-      - name: Checkout with ${{ matrix.postgres-version }} Submodule
+      - name: Checkout with postgres-${{ matrix.postgres-version }} Submodule
         uses: actions/checkout@v4
         with:
           submodules: true
           sparse-checkout: |
-            vendor/${{ matrix.postgres-version }}
+            vendor/postgres-${{ matrix.postgres-version }}
 
-      - name: Build ${{ matrix.postgres-version }}
+      - name: Build Postgres ${{ matrix.postgres-version }}
         run: |
-          echo make ${{ matrix.postgres-version }}
-          echo make $(echo "${{ matrix.postgres-version }}" | sed -e 's/postgres-/neon-pg-ext-/')
+          make postgres-${{ matrix.postgres-version }}
+
+      - name: Build Neon Pg Ext ${{ matrix.postgres-version }}
+        run: |
+          make "neon-pg-ext-${{ matrix.postgres-version }}"
+
+      - name: Build walproposer-lib (only for v17)
+        if: ${{ matrix.postgres-version}} == "v17"
+        run:
+          make walproposer-lib