diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 2cf816c4..6b159619 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,24 +1,30 @@
 agents:
-  public: "true"
-  os: "linux"
+  queue: "nix-eval"
 
 steps:
+  - command: nix flake archive .#
+    label: ":nixos: Archive Nix flake inputs"
+    agents:
+      queue: "nix-build"
+
   - command: nix-buildkite
     label: ":nixos: :buildkite:"
     plugins:
-      - circuithub/nix-buildkite:
+      - hackworthltd/nix#v1.0.0:
           file: ci.nix
-
-  - label: ":nixos: Archive Nix flake inputs"
-    command: nix flake archive .#
+          agent-tags: queue=nix-build,os=linux
 
   - wait
 
   - label: ":nixos: :linux: Cache the Nix shell"
     command: |
       nix develop --print-build-logs --profile /tmp/primer-app --command echo "done"
+    agents:
+      queue: "nix-build"
+
   - label: ":nixos: :macos: Cache the Nix shell"
     command: |
       nix develop --print-build-logs --profile /tmp/primer-app --command echo "done"
     agents:
+      queue: "nix-build"
       os: "darwin"
diff --git a/.buildkite/public-cache-push.yaml b/.buildkite/public-cache-push.yaml
deleted file mode 100644
index 8b429112..00000000
--- a/.buildkite/public-cache-push.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-agents:
-  public: "true"
-  os: "linux"
-
-env:
-  CACHIX_CACHE_NAME: hackworthltd
-  CACHIX_CONFIG_PATH: /var/lib/cachix/hackworthltd/cachix.dhall
-
-steps:
-  - label: ":nixos: Archive Nix flake inputs to public cache"
-    command: nix run github:hackworthltd/hacknix#cachix-archive-flake-inputs .# $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME
-
-  - label: ":nixos: Push project to public cache"
-    command: nix run github:hackworthltd/hacknix#cachix-push-attr ciJobs $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME
-    # Limit to 1 such job at a time because this could be very
-    # bandwidth-intensive, and sustained.
-    concurrency: 1
-    concurrency_group: "primer-app-cachix-push"
-
-  - wait
-
-  - label: ":nixos: :linux: Cache Nix shell to public cache"
-    command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-app-dev-shell $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME
-
-  - label: ":nixos: :macos: Cache Nix shell to public cache"
-    command: nix run github:hackworthltd/hacknix#cachix-push-flake-dev-shell primer-app-dev-shell $CACHIX_CONFIG_PATH $CACHIX_CACHE_NAME
-    agents:
-      os: "darwin"