diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json
index af1cb0632..4dd07aabb 100644
--- a/.github/build-ci/data/standard.json
+++ b/.github/build-ci/data/standard.json
@@ -1,7 +1,7 @@
 {
-  "intel_compiler": "intel@2021.10.0",
-  "gcc_compiler": "gcc@13.2.0",
-  "oneapi_compiler": "oneapi@2025.2.0",
+  "intel_compiler_version": "2021.10.0",
+  "gcc_compiler_version": "13.2.0",
+  "oneapi_compiler_version": "2025.2.0",
   "cice4_version": "git.access-esm1.5-2025.04.001=access-esm1.5",
   "um_version": "git.2024.10.17=access-esm1.5",
   "gcom4_version": "git.2024.05.28=access-esm1.5",
diff --git a/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2
index b0a26c0d4..1f2c70539 100644
--- a/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2
+++ b/.github/build-ci/manifests/pr/intel_access-esm1.5.spack.yaml.j2
@@ -26,9 +26,13 @@ spack:
     openmpi:
       require:
       - '@{{ openmpi_version }}'
+    intel-oneapi-compilers-classic:
+      require:
+      - '@{{ intel_compiler_version }}'
     all:
       require:
-      - '%{{ intel_compiler }} target=x86_64'
+      - '%access_intel'
+      - 'target=x86_64'
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2
index ed07c03ae..83b9045b4 100644
--- a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2
+++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.5.spack.yaml.j2
@@ -14,9 +14,13 @@ spack:
     openmpi:
       require:
       - '@{{ openmpi_version }}'
+    gcc:
+      require:
+      - '@{{ gcc_compiler_version }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target=x86_64'
+      - '%access_gcc'
+      - 'target=x86_64'
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2
index 5128237c2..674914dbf 100644
--- a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2
+++ b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.5.spack.yaml.j2
@@ -14,9 +14,13 @@ spack:
     openmpi:
       require:
       - '@{{ openmpi_version }}'
+    intel-oneapi-compilers-classic:
+      require:
+      - '@{{ intel_compiler_version }}'
     all:
       require:
-      - '%{{ intel_compiler }} target=x86_64'
+      - '%access_intel'
+      - 'target=x86_64'
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2
index ee0b041c3..de84f4ded 100644
--- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2
+++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.5.spack.yaml.j2
@@ -14,12 +14,13 @@ spack:
     openmpi:
       require:
       - '@{{ openmpi_version }}'
-    gcc-runtime:
+    intel-oneapi-compilers-classic:
       require:
-      - '%gcc'
+      - '@{{ oneapi_compiler_version }}'
     all:
       require:
-      - '%{{ oneapi_compiler }} target=x86_64'
+      - '%access_oneapi'
+      - 'target=x86_64'
   concretizer:
     unify: false
   view: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f0c3a174..df5128eb5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,13 +29,12 @@ jobs:
       max-parallel: 4
       matrix:
         file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
-    uses: access-nri/build-ci/.github/workflows/ci.yml@v2
+    uses: access-nri/build-ci/.github/workflows/ci.yml@v3
     with:
       spack-manifest-path: ${{ matrix.file }}
       spack-manifest-data-path: .github/build-ci/data/standard.json
       allow-ssh-into-spack-install: false  # If true, PR author must ssh into instance to complete job
-      # spack-packages-ref: main
-      # spack-config-ref: main
-      # spack-ref: releases/v0.22
+      # Default args (including explicit spack/spack-packages/spack-config versions)
+      # are specified in https://github.com/ACCESS-NRI/build-ci/tree/v3/.github/workflows#inputs
     secrets:
       spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }}