diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json
new file mode 100644
index 0000000..683ecc2
--- /dev/null
+++ b/.github/build-ci/data/standard.json
@@ -0,0 +1,4 @@
+{
+    "intel_compiler_version": "2021.10.0",
+    "target": "x86_64"
+}
diff --git a/.github/build-ci/manifests/spack.yaml.j2 b/.github/build-ci/manifests/spack.yaml.j2
index 2e3ee50..44da72e 100644
--- a/.github/build-ci/manifests/spack.yaml.j2
+++ b/.github/build-ci/manifests/spack.yaml.j2
@@ -1,6 +1,14 @@
 spack:
   specs:
-  - mppnccombine-fast@git.{{ ref }} %intel@2021.10.0
+  - mppnccombine-fast@git.{{ ref }}
+  packages:
+    intel-oneapi-compilers-classic:
+      require:
+      - '@{{ intel_compiler_version }}'
+    all:
+      require:
+      - '%access_intel'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f0b9de..401fb6e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,10 @@ on:
 jobs:
   ci:
     name: CI
-    uses: access-nri/build-ci/.github/workflows/ci.yml@v2
+    uses: access-nri/build-ci/.github/workflows/ci.yml@v3
     with:
       spack-manifest-path: .github/build-ci/manifests/spack.yaml.j2
-      allow-ssh-into-spack-install: false
\ No newline at end of file
+      spack-manifest-data-path: .github/build-ci/data/standard.json
+      allow-ssh-into-spack-install: false
+      # 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