diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9e6d261b183..96ffda09c97 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,7 +6,7 @@ env:
   NIX_PATH: "channel:nixos-21.11"
 
   # Per-host variables - shared across containers on host
-  macos: "x86_64-darwin"
+  macos: "aarch64-darwin"
   linux: "x86_64-linux"
 
 
@@ -20,8 +20,12 @@ steps:
   - wait: ~
     if: 'build.branch == "staging"'
 
+  - block: "Build package and docker image (linux)"
+    key: trigger-linux
+
   - label: 'Check nix (linux)'
     # Check whether regenerate.sh was applied when it had to be applied.
+    depends_on: trigger-linux
     key: linux-nix
     commands:
       - './nix/regenerate.sh'
@@ -133,33 +137,33 @@ steps:
   - block: "macOS steps"
     depends_on: linux-nix
     key: trigger-macos
-    if: 'build.branch != "master"'
+    if: 0 == 1 #'build.branch != "master"'
 
   - label: 'Check nix (macOS)'
     depends_on: trigger-macos
     key: macos-nix
     commands:
-      - './nix/regenerate.sh'
+      - 'nix flake info'
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
-  - label: 'Run unit tests (macOS)'
+  - label: 'Run unit tests (macOS, x86_64)'
     depends_on: macos-nix
     key: macos-build-tests
-    command: 'GC_DONT_GC=1 nix build --max-silent-time 0 --max-jobs 1 -L .#ci.${macos}.tests.run.unit'
+    command: 'GC_DONT_GC=1 nix build --max-silent-time 0 --max-jobs 1 -L .#ci.x86_64-darwin.tests.run.unit'
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
-  - label: 'Build package (macOS)'
+  - label: 'Build package (macOS, x86_64)'
     depends_on: macos-nix
     key: build-macos
-    command: nix build --max-silent-time 0 --max-jobs 1 -o result/macos-intel .#ci.artifacts.macos-intel.release
+    command: nix build --max-silent-time 0 --max-jobs 1 -o result/macos-intel .#packages.x86_64-darwin.ci.artifacts.macos-intel.release
     artifact_paths: [ "./result/macos-intel/**" ]
     agents:
       system: ${macos}
-    if: 0 == 1 # Disabled for now until a macos mini is available
+    # if: 0 == 1 # Disabled for now until a macos mini is available
 
   - block: "Build package and docker image (linux)"
     depends_on: linux-nix