diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json
index 69e850888..2dabd49cd 100644
--- a/.github/build-ci/data/standard.json
+++ b/.github/build-ci/data/standard.json
@@ -1,4 +1,4 @@
 {
-    "gcc_compiler": "gcc@13.2.0",
+    "gcc_compiler_version": "13.2.0",
     "target": "x86_64"
 }
diff --git a/.github/build-ci/manifests/gcc-ad.spack.yaml.j2 b/.github/build-ci/manifests/gcc-ad.spack.yaml.j2
index 3f821742a..781aee4d6 100644
--- a/.github/build-ci/manifests/gcc-ad.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc-ad.spack.yaml.j2
@@ -2,9 +2,18 @@ spack:
   specs:
   - issm @git.{{ ref }} +wrappers +ad
   packages:
+    # Workaround due to https://github.com/spack/spack-packages/pull/3644
+    re2c:
+      require:
+      - '@3.1'
+
+    gcc:
+      require:
+      - '@{{ gcc_compiler_version }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target}}'
+      - '%access_gcc'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false
diff --git a/.github/build-ci/manifests/gcc-no-ad.spack.yaml.j2 b/.github/build-ci/manifests/gcc-no-ad.spack.yaml.j2
index 8f5cc4d9e..486a7a2c4 100644
--- a/.github/build-ci/manifests/gcc-no-ad.spack.yaml.j2
+++ b/.github/build-ci/manifests/gcc-no-ad.spack.yaml.j2
@@ -2,9 +2,18 @@ spack:
   specs:
   - issm @git.{{ ref }} +wrappers ~ad
   packages:
+    # Workaround due to https://github.com/spack/spack-packages/pull/3644
+    re2c:
+      require:
+      - '@3.1'
+
+    gcc:
+      require:
+      - '@{{ gcc_compiler_version }}'
     all:
       require:
-      - '%{{ gcc_compiler }} target={{ target}}'
+      - '%access_gcc'
+      - 'target={{ target }}'
   concretizer:
     unify: false
   view: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74c5212a5..2dc0bf9f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,11 +26,10 @@ jobs:
       max-parallel: 2
       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 }}
       allow-ssh-into-spack-install: false  # If true, PR author must ssh into instance to complete job
       spack-manifest-data-path: .github/build-ci/data/standard.json
-      # 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