diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2
index d1dab8b3d..0a19b84dc 100644
--- a/.github/build-ci/manifests/gcc.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc.spack.yaml.j2
@@ -2,9 +2,12 @@ spack:
   specs:
   - cable@git.{{ ref }}
   packages:
+    gcc:
+      require:
+      - '@13.2.0'
     all:
       require:
-      - '%gcc@13.2.0'
+      - '%access_gcc'
       - target=x86_64
   concretizer:
     unify: false
diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2
index a4ffc1b83..47559d82b 100644
--- a/.github/build-ci/manifests/intel.spack.yaml.j2
+++ b/.github/build-ci/manifests/intel.spack.yaml.j2
@@ -2,9 +2,15 @@ spack:
   specs:
   - cable@git.{{ ref }}
   packages:
+    python:
+      require:
+        - '@3.11.14'
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
     all:
       require:
-      - '%intel@2021.10.0'
+      - '%access_intel'
       - target=x86_64
   concretizer:
     unify: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 849f76700..1bf309c52 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,14 +12,13 @@ jobs:
         spack-manifest-path:
           - .github/build-ci/manifests/gcc.spack.yaml.j2
           - .github/build-ci/manifests/intel.spack.yaml.j2
-    uses: access-nri/build-ci/.github/workflows/ci-github-hosted.yml@v2
+    uses: access-nri/build-ci/.github/workflows/ci.yml@v3
     with:
+      # For defaults for args not specified here (eg. spack/packages/config refs), see https://github.com/ACCESS-NRI/build-ci/blob/v3/.github/workflows/README.md
       spack-manifest-path: ${{ matrix.spack-manifest-path }}
-      spack-config-ref: 2025.11.000  # Before build-ci@v2-breaking change to spack-config, don't go any further forward!
-      spack-packages-ref: api-v2  # This branch contains the package defs compatible with spack >=1.0. May be incorporated into the main branch
-      spack-ref: releases/v1.0
       allow-ssh-into-spack-install: false
-      container-image-version: :rocky-v1.0-2025.09.000  # https://github.com/ACCESS-NRI/build-ci/pkgs/container/build-ci-upstream/501398004?tag=rocky-v1.0-2025.09.000
       spack-oci-buildcache-url: oci://ghcr.io/CABLE-LSM/build-ci-buildcache  # https://github.com/CABLE-LSM/CABLE/pkgs/container/build-ci-buildcache
+      # Since CABLE-LSM can't access ACCESS-NRI's self-hosted runners, we use a GitHub-hosted version
+      run-self-hosted: false
     permissions:
       packages: write