diff --git a/.crow/build-all-versions-amd64.yaml b/.crow/build-all-versions-amd64.yaml
deleted file mode 100644
index be356fb..0000000
--- a/.crow/build-all-versions-amd64.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-### Required extra vars
-# ARCH (amd64)
-# OS (alpine)
-# OS_VERSION (3.22)
-# R_VERSION (4.5.3)
-# crow pipeline create --var ARCH=amd64 --var OS=alpine --var OS_VERSION=3.24 --var R_VERSION=4.5.3 --var task=build-all-amd64 --branch=main --log-level=info 5
-when:
-  - event: manual
-    evaluate: 'task == "build-all-amd64"'
-
-skip_clone: true
-
-labels:
-  platform: linux/amd64
-  agent: artemis
-
-matrix:
-  include:
-    - SPLIT_INTO: 4
-      SPLIT_INDEX: 1
-      BACKEND: kubernetes
-    - SPLIT_INTO: 4
-      SPLIT_INDEX: 2
-      BACKEND: kubernetes
-    - SPLIT_INTO: 4
-      SPLIT_INDEX: 3
-      BACKEND: kubernetes
-    - SPLIT_INTO: 4
-      SPLIT_INDEX: 4
-      BACKEND: kubernetes
-    # - SPLIT_INTO: 4
-    #   SPLIT_INDEX: 5
-    #   BACKEND: kubernetes
-
-depends_on:
-  - build-all-versions-install-deps-amd64
-
-steps:
-  - name: 'Build binaries'
-    image: 'reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}'
-    pull: true
-    environment:
-      RED_HAT_DEV_PW:
-        from_secret: RED_HAT_DEV_PW
-      B2_S3_ACCESS_KEY:
-        from_secret: B2_S3_ACCESS_KEY
-      B2_S3_SECRET_KEY:
-        from_secret: B2_S3_SECRET_KEY
-      PGPASS:
-        from_secret: PGPASS
-      REPO_RO_TOKEN:
-        from_secret: REPO_RO_TOKEN
-      GITHUB_PAT:
-        from_secret: GITHUB_PAT
-      # normal env vars
-      GIT_USER: pat-s
-      # set the location of the 'pkgcache' cache dir which persists the R package dependencies needed to install the packages themselves
-      R_PKG_CACHE_DIR: ''
-      R_LIBS_USER: /mnt/cache/R-pkgs
-      CCACHE_DIR: /mnt/cache/ccache
-      NCPUS: 2
-    volumes:
-      - ${ARCH}-binaries-r-dep-cache-${OS}-${OS_VERSION//./}:/mnt/cache
-    commands:
-      - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
-      - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
-      # Windows-only: 'RInno', 'KeyboardSimulator', 'R2PPT', 'RWinEdt', 'blatr', 'excel.link', 'spectrino', 'taskscheduleR', 'MDSGUI', 'BiplotGUI', 'R2wd', 'rFUSION', 'MediaNews', 'rFUSION', 'MediaNews'
-      # pkgs = readRDS('/mnt/cache/pkgs_amd64.rds');
-      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS=""; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
-      - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/$R_VERSION/bin/Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
-      - |
-        PRIMARY_MINOR=$(echo "$R_VERSION" | cut -d. -f1-2)
-        for RBIN in /opt/R/[0-9]*/bin/R; do
-          RV=$(basename "$(dirname "$(dirname "$RBIN")")")
-          RMINOR=$(echo "$RV" | cut -d. -f1-2)
-          [ "$RMINOR" = "$PRIMARY_MINOR" ] && continue
-          echo "=== R-minor-sensitive pass under R $RV ==="
-          LIB="/mnt/cache/R-pkgs-$RMINOR"
-          mkdir -p "$LIB"
-          R_LIBS_USER="$LIB" "$(dirname "$RBIN")/R" -q -e 'if (!requireNamespace("bincraft", quietly = TRUE) || packageVersion("bincraft") != "4.2.2") pak::pak("git::https://codefloe.com/rpkgs/bincraft.git@v4.2.2")' || true
-          R_LIBS_USER="$LIB" $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- "$(dirname "$RBIN")/Rscript" local/build-all.R --sensitive-only $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1 || true
-        done
-      # archive missed packages
-      - /opt/R/$R_VERSION/bin/R -q -e "bincraft::process_unarchived_pkgs(paste(Sys.getenv('OS'), Sys.getenv('OS_VERSION')), Sys.getenv('ARCH'), workers = $NCPUS)"
-    backend_options:
-      docker:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-          limits:
-            memory: 20Gi
-            cpu: 2000m
-      kubernetes:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-          limits:
-            memory: 20Gi
-            cpu: 2000m
-        nodeSelector:
-          kubernetes.io/arch: ${ARCH}
-          node.kubernetes.io/instance-type: ${K8S_INSTANCE_TYPE}
-        tolerations:
-          - key: 'CI'
-            operator: 'Equal'
-            value: 'true'
-            effect: 'NoSchedule'
-  - name: 'Upload package indexes'
-    image: 'reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}'
-    pull: true
-    environment:
-      B2_S3_ACCESS_KEY:
-        from_secret: B2_S3_ACCESS_KEY
-      B2_S3_SECRET_KEY:
-        from_secret: B2_S3_SECRET_KEY
-      R_LIBS_USER: /mnt/cache/R-pkgs
-    volumes:
-      - ${ARCH}-binaries-r-dep-cache-${OS}-${OS_VERSION//./}:/mnt/cache
-    commands:
-      - |
-        CODENAME=$(/opt/R/$R_VERSION/bin/Rscript -e "cat(bincraft::set_codename(NULL))")
-        /opt/R/$R_VERSION/bin/R -q -e "bincraft::upload_package_index(codename = '$CODENAME', s3_endpoint = 'https://s3.eu-central-003.backblazeb2.com', s3_region = 'eu-central-003', s3_bucket = 'devxy-rpkgs-binaries', s3_access_key_id = Sys.getenv('B2_S3_ACCESS_KEY'), s3_secret_access_key = Sys.getenv('B2_S3_SECRET_KEY'))"
-        for RBIN in /opt/R/[0-9]*/bin/R; do
-          RMINOR=$(basename "$(dirname "$(dirname "$RBIN")")" | cut -d. -f1-2)
-          /opt/R/$R_VERSION/bin/R -q -e "bincraft::upload_package_index(codename = '$CODENAME', r_minor = '$RMINOR', s3_endpoint = 'https://s3.eu-central-003.backblazeb2.com', s3_region = 'eu-central-003', s3_bucket = 'devxy-rpkgs-binaries', s3_access_key_id = Sys.getenv('B2_S3_ACCESS_KEY'), s3_secret_access_key = Sys.getenv('B2_S3_SECRET_KEY'))" || true
-        done
-    backend_options:
-      docker:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-          limits:
-            memory: 20Gi
-            cpu: 2000m
-      kubernetes:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-          limits:
-            memory: 20Gi
-            cpu: 2000m
-        nodeSelector:
-          kubernetes.io/arch: ${ARCH}
-          node.kubernetes.io/instance-type: ${K8S_INSTANCE_TYPE}
-        tolerations:
-          - key: 'CI'
-            operator: 'Equal'
-            value: 'true'
-            effect: 'NoSchedule'
diff --git a/.crow/build-all-versions-install-deps-arm64.yaml b/.crow/build-all-versions-install-deps-arm64.yaml
deleted file mode 100644
index 98decea..0000000
--- a/.crow/build-all-versions-install-deps-arm64.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-when:
-  - event: manual
-    evaluate: 'task == "build-all-arm64"'
-
-skip_clone: true
-
-labels:
-  agent: gaia
-
-steps:
-  - name: 'Install deps and bincraft'
-    image: 'reg.devxy.io/rpkgs/build-env-${OS}:${OS_VERSION}'
-    pull: true
-    environment:
-      REPO_RO_TOKEN:
-        from_secret: REPO_RO_TOKEN
-      GITHUB_PAT:
-        from_secret: GITHUB_PAT
-      B2_S3_ACCESS_KEY:
-        from_secret: B2_S3_ACCESS_KEY
-      B2_S3_SECRET_KEY:
-        from_secret: B2_S3_SECRET_KEY
-      PGPASS:
-        from_secret: PGPASS
-      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
-      R_LIBS_USER: /mnt/cache/R-pkgs
-      CCACHE_DIR: /mnt/cache/ccache
-    volumes:
-      - ${ARCH}-binaries-r-dep-cache-${OS}-${OS_VERSION//./}:/mnt/cache
-    commands:
-      # one-time full wipe to fix corrupted .so files from previous failed builds
-      # - rm -rf /mnt/cache/R-pkgs
-      - mkdir -p /mnt/cache/pkgcache /mnt/cache/R-pkgs /mnt/cache/ccache /mnt/cache/packages
-      - git clone -q https://pat-s:$$REPO_RO_TOKEN@git.devxy.io/devxy/build-cran-binaries.git .
-      - git clone -q https://codefloe.com/rpkgs/bincraft.git /tmp/bincraft
-      - /opt/R/$R_VERSION/bin/R -q -e 'pak::sysreqs_db_update(); pak::local_install("/tmp/bincraft"); pak::pak(c("RPostgres", "s3fs", "data.table", "future", "jsonlite")); packageVersion("bincraft")'
-      - /opt/R/$R_VERSION/bin/R -q -e "source('local/packages-to-build.R'); saveRDS(pkgs, '/mnt/cache/packages/pkgs_to_build.rds'); saveRDS(pkgs[r_minor_sensitive == TRUE], '/mnt/cache/packages/r_minor_sensitive_pkgs.rds'); sprintf('Precomputed %s package versions (%s r-minor-sensitive)', nrow(pkgs), nrow(pkgs[r_minor_sensitive == TRUE]))"
-    backend_options:
-      docker:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-      kubernetes:
-        resources:
-          requests:
-            memory: 5Gi
-            cpu: 1000m
-        nodeSelector:
-          kubernetes.io/arch: ${ARCH}
-          node.kubernetes.io/instance-type: ${K8S_INSTANCE_TYPE}
-        tolerations:
-          - key: 'CI'
-            operator: 'Equal'
-            value: 'true'
-            effect: 'NoSchedule'
diff --git a/.crow/build-all-versions-install-deps-amd64.yaml b/.crow/build-all-versions-install-deps.yaml
similarity index 82%
rename from .crow/build-all-versions-install-deps-amd64.yaml
rename to .crow/build-all-versions-install-deps.yaml
index 285a4e2..61e3dea 100644
--- a/.crow/build-all-versions-install-deps-amd64.yaml
+++ b/.crow/build-all-versions-install-deps.yaml
@@ -1,12 +1,23 @@
+# Consolidated install-deps for build-all (both arches in one file).
+# Arch is a matrix axis; the existing task selector still routes it:
+#   task == "build-all-amd64" runs the amd64 row, "build-all-arm64" the arm64 row.
+# OS / OS_VERSION / R_VERSION / K8S_INSTANCE_TYPE are still passed via --var.
 when:
   - event: manual
-    evaluate: 'task == "build-all-amd64"'
+    evaluate: 'task == "build-all-${ARCH}"'
 
 skip_clone: true
 
 labels:
   platform: linux/${ARCH}
-  agent: artemis
+  agent: ${AGENT}
+
+matrix:
+  include:
+    - ARCH: amd64
+      AGENT: artemis
+    - ARCH: arm64
+      AGENT: gaia
 
 steps:
   - name: 'Install deps and bincraft'
diff --git a/.crow/build-all-versions-arm64.yaml b/.crow/build-all-versions.yaml
similarity index 77%
rename from .crow/build-all-versions-arm64.yaml
rename to .crow/build-all-versions.yaml
index be45659..36969b2 100644
--- a/.crow/build-all-versions-arm64.yaml
+++ b/.crow/build-all-versions.yaml
@@ -1,55 +1,72 @@
-### Required extra vars
-# ARCH (amd64)
-# OS (alpine)
-# OS_VERSION (3.22)
-# R_VERSION (4.5.3)
+### Required extra vars (passed via --var at manual trigger time)
+# OS (alpine) / OS_VERSION (3.22) / R_VERSION (4.5.3) / K8S_INSTANCE_TYPE (amd64)
+# Arch is selected by the task name and routed via the matrix:
+#   crow pipeline create --var task=build-all-amd64 --var OS=alpine --var OS_VERSION=3.24 --var R_VERSION=4.5.3 --var K8S_INSTANCE_TYPE=... --branch=main 5
+#   crow pipeline create --var task=build-all-arm64 --var OS=alpine --var OS_VERSION=3.24 --var R_VERSION=4.5.3 --branch=main 5
 # Skip list lives in local/excluded-packages.json (read by local/build-all.R).
-# crow pipeline create --var ARCH=arm64 --var OS=alpine --var OS_VERSION=3.24 --var R_VERSION=4.5.3 --var task=build-all-arm64 --branch=main --log-level=info 5
-# crow pipeline create --var ARCH=arm64 --var OS=alpine --var OS_VERSION=3.24 --var R_VERSION=4.5.3 --var task=build-all-arm64 --branch=main --log-level=info 5
 when:
   - event: manual
-    evaluate: 'task == "build-all-arm64"'
+    evaluate: 'task == "build-all-${ARCH}"'
 
 skip_clone: true
 
 labels:
-  agent: gaia
+  platform: linux/${ARCH}
+  agent: ${AGENT}
 
 matrix:
   include:
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 1
-    #   BACKEND: kubernetes
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 2
-    #   BACKEND: kubernetes
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 3
-    #   BACKEND: kubernetes
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 4
-    #   BACKEND: kubernetes
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 5
-    #   BACKEND: kubernetes
-    - SPLIT_INTO: 4
+    - ARCH: amd64
+      AGENT: artemis
+      BACKEND: kubernetes
+      R_PKG_CACHE_DIR: ''
+      SPLIT_INTO: 4
       SPLIT_INDEX: 1
-      BACKEND: docker
-    - SPLIT_INTO: 4
+    - ARCH: amd64
+      AGENT: artemis
+      BACKEND: kubernetes
+      R_PKG_CACHE_DIR: ''
+      SPLIT_INTO: 4
       SPLIT_INDEX: 2
-      BACKEND: docker
-    - SPLIT_INTO: 4
+    - ARCH: amd64
+      AGENT: artemis
+      BACKEND: kubernetes
+      R_PKG_CACHE_DIR: ''
+      SPLIT_INTO: 4
       SPLIT_INDEX: 3
-      BACKEND: docker
-    - SPLIT_INTO: 4
+    - ARCH: amd64
+      AGENT: artemis
+      BACKEND: kubernetes
+      R_PKG_CACHE_DIR: ''
+      SPLIT_INTO: 4
       SPLIT_INDEX: 4
+    - ARCH: arm64
+      AGENT: gaia
       BACKEND: docker
-    # - SPLIT_INTO: 5
-    #   SPLIT_INDEX: 5
-    #   BACKEND: docker
+      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
+      SPLIT_INTO: 4
+      SPLIT_INDEX: 1
+    - ARCH: arm64
+      AGENT: gaia
+      BACKEND: docker
+      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
+      SPLIT_INTO: 4
+      SPLIT_INDEX: 2
+    - ARCH: arm64
+      AGENT: gaia
+      BACKEND: docker
+      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
+      SPLIT_INTO: 4
+      SPLIT_INDEX: 3
+    - ARCH: arm64
+      AGENT: gaia
+      BACKEND: docker
+      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
+      SPLIT_INTO: 4
+      SPLIT_INDEX: 4
 
 depends_on:
-  - build-all-versions-install-deps-arm64
+  - build-all-versions-install-deps
 
 steps:
   - name: 'Build binaries'
@@ -71,7 +88,7 @@ steps:
       # normal env vars
       GIT_USER: pat-s
       # set the location of the 'pkgcache' cache dir which persists the R package dependencies needed to install the packages themselves
-      R_PKG_CACHE_DIR: /mnt/cache/pkgcache
+      R_PKG_CACHE_DIR: ${R_PKG_CACHE_DIR}
       R_LIBS_USER: /mnt/cache/R-pkgs
       CCACHE_DIR: /mnt/cache/ccache
       NCPUS: 2