diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json
index 0d0bb971..3a6c93b6 100644
--- a/.github/build-ci/data/standard.json
+++ b/.github/build-ci/data/standard.json
@@ -1,5 +1,6 @@
 {
-  "intel_compiler": "intel@2021.10.0",
-  "gcc_compiler": "gcc@13.2.0",
-  "oneapi_compiler": "oneapi@2025.2.0"
-}
\ No newline at end of file
+  "intel_compiler_version": "2021.10.0",
+  "gcc_compiler_version": "13.2.0",
+  "oneapi_compiler_version": "2025.2.0",
+  "fms_version": "2025.03"
+}
diff --git a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2
index 5e1c6b16..25339226 100644
--- a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2
@@ -5,10 +5,14 @@ spack:
   packages:
     fms:
       require:
-        - '@git.2025.02=2025.02 ~openmp precision=64'
+        - '@{{ fms_version }} ~openmp precision=64'
+    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/gcc-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2
index f0a06c43..3e7970dd 100644
--- a/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2
@@ -3,9 +3,13 @@ spack:
   # *_compiler is defined in the .github/build-ci/data/standard.json file
   - access-generic-tracers@git.{{ ref }} +use_access_fms
   packages:
+    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/intel-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2
index 02eab2af..d9b25ae6 100644
--- a/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2
@@ -5,10 +5,14 @@ spack:
   packages:
     fms:
       require:
-        - '@git.2025.02=2025.02 ~openmp precision=64'
+        - '@{{ fms_version }} ~openmp precision=64'
+    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/intel-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2
index 8938a52f..57ac4782 100644
--- a/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2
@@ -3,9 +3,13 @@ spack:
   # *_compiler is defined in the .github/build-ci/data/standard.json file
   - access-generic-tracers@git.{{ ref }} +use_access_fms
   packages:
+    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/oneapi-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2
index 06269d8e..b0d0742d 100644
--- a/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2
@@ -5,13 +5,17 @@ spack:
   packages:
     fms:
       require:
-        - '@git.2025.02=2025.02 ~openmp precision=64'
+        - '@{{ fms_version }} ~openmp precision=64'
     gcc-runtime:
       require:
-        - '%gcc'
+        - '%access_gcc'
+    intel-oneapi-compilers:
+      require:
+      - '@{{ oneapi_compiler_version }}'
     all:
       require:
-      - '%{{ oneapi_compiler }} target=x86_64'
+      - '%access_oneapi'
+      - target=x86_64
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2
index c1c0934d..085dd441 100644
--- a/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2
+++ b/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2
@@ -5,10 +5,14 @@ spack:
   packages:
     gcc-runtime:
       require:
-        - '%gcc'
+        - '%access_gcc'
+    intel-oneapi-compilers:
+      require:
+      - '@{{ 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/build.yml b/.github/workflows/build.yml
index 4727fd25..fb18920b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,11 +32,10 @@ jobs:
       max-parallel: 3
       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