diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index ad226214d..1f512a3a2 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: style
+          tools: style.lint.bin style.styleCheck.bin
       - name: Run linter (check locally with `nix-shell --run postgrest-lint`)
         run: postgrest-lint
       - name: Run style check (auto-format with `nix-shell --run postgrest-style`)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 953082628..b21bb6940 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -245,7 +245,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: release
+          tools: release.dockerHubDescription.bin
       - name: Download Docker image
         uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4
         with:
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index cb0f4a468..a4eab318a 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -32,7 +32,7 @@ jobs:
       uses: ./.github/actions/setup-nix
       with:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-        tools: docs
+        tools: docs.build.bin
     - run: postgrest-docs-build
     - run: git diff --exit-code HEAD locales || echo "Please commit changes to the locales/ folder after running postgrest-docs-build."
 
@@ -46,7 +46,7 @@ jobs:
       uses: ./.github/actions/setup-nix
       with:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-        tools: docs
+        tools: docs.spellcheck.bin docs.dictcheck.bin
     - name: Run spellcheck
       run: postgrest-docs-spellcheck
     - name: Run dictcheck
@@ -63,5 +63,5 @@ jobs:
       uses: ./.github/actions/setup-nix
       with:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-        tools: docs
+        tools: docs.linkcheck.bin
     - run: postgrest-docs-linkcheck
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8b12e6dba..1524f9fce 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -44,7 +44,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests
+          tools: tests.coverage.bin tests.testDoctests.bin tests.testSpecIdempotence.bin
 
       - name: Run coverage (IO tests and Spec tests against PostgreSQL 15)
         run: postgrest-coverage
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgVersion: [9.6, 10, 11, 12, 13, 14, 15, 16]
+        pgVersion: ["9_6", 10, 11, 12, 13, 14, 15, 16]
     name: PG ${{ matrix.pgVersion }}
     runs-on: ubuntu-latest
     defaults:
@@ -81,7 +81,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests withTools
+          tools: tests.testSpec.bin tests.testIO.bin withTools.postgresql-${{ matrix.pgVersion }}.bin
 
       - name: Run spec tests
         if: always()
@@ -101,7 +101,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: memory
+          tools: memory.test.bin
       - name: Run memory tests
         run: postgrest-test-memory
 
@@ -117,7 +117,7 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: loadtest
+          tools: loadtest.loadtestAgainst.bin loadtest.report.bin
       - uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # v1.4.0
         id: get-latest-tag
         with:
diff --git a/default.nix b/default.nix
index e180a6f38..48903f3fc 100644
--- a/default.nix
+++ b/default.nix
@@ -63,7 +63,7 @@ let
       { name = "postgresql-12"; postgresql = pkgs.postgresql_12.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "postgresql-11"; postgresql = pkgs.postgresql_11.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "postgresql-10"; postgresql = pkgs.postgresql_10.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "postgresql-9.6"; postgresql = pkgs.postgresql_9_6.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      { name = "postgresql-9_6"; postgresql = pkgs.postgresql_9_6.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
     ];
 
   # Dynamic derivation for PostgREST