diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 624ee52..9a9a4f7 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -10,11 +10,11 @@ on:
 jobs:
   cd:
     name: CD
-    uses: access-nri/build-cd/.github/workflows/cd.yml@v7
+    uses: access-nri/build-cd/.github/workflows/cd.yml@342-name-reserved-def-as-sbr_TEST
     with:
       model: ${{ vars.NAME }}
-      spack-manifest-schema-version: 1-0-7
-      config-versions-schema-version: 3-0-0
+      spack-manifest-schema-version: 2-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       contents: write
diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml
index b06012e..7aca68f 100644
--- a/.github/workflows/ci-command.yml
+++ b/.github/workflows/ci-command.yml
@@ -8,10 +8,9 @@ jobs:
   redeploy:
     name: Redeploy
     if: startsWith(github.event.comment.body, '!redeploy') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci.yml@342-name-reserved-def-as-sbr_TEST
     with:
       model: ${{ vars.NAME }}
-      pr: ${{ github.event.issue.number }}
       spack-manifest-schema-version: 1-0-7
       config-versions-schema-version: 3-0-0
       config-packages-schema-version: 1-0-0
@@ -23,7 +22,7 @@ jobs:
   bump:
     name: Bump
     if: startsWith(github.event.comment.body, '!bump') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@342-name-reserved-def-as-sbr_TEST
     with:
       model: ${{ vars.NAME }}
     permissions:
@@ -33,7 +32,7 @@ jobs:
   configs:
     name: Configs
     if: startsWith(github.event.comment.body, '!update-configs') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@342-name-reserved-def-as-sbr_TEST
     with:
       model: ${{ vars.NAME }}
       auto-configs-pr-schema-version: 1-0-0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef56a62..133bd3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,15 +19,12 @@ on:
 jobs:
   pr-ci:
     name: CI
-    if: >-
-      github.event.action != 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    if: github.event.action != 'closed'
+    uses: access-nri/build-cd/.github/workflows/ci.yml@342-name-reserved-def-as-sbr_TEST
     with:
       model: ${{ vars.NAME }}
-      # root-sbd: if different from vars.NAME
-      pr: ${{ github.event.pull_request.number }}
-      spack-manifest-schema-version: 1-0-7
-      config-versions-schema-version: 3-0-0
+      spack-manifest-schema-version: 2-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       pull-requests: write
@@ -37,7 +34,5 @@ jobs:
   pr-closed:
     name: Closed
     if: github.event.action == 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7
-    with:
-      root-sbd: access-test
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@342-name-reserved-def-as-sbr_TEST
     secrets: inherit
diff --git a/config/versions.json b/config/versions.json
index 3b948ab..1e564d9 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
-    "spack": "0.22",
-    "spack-packages": "main"
+  "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
+  "spack": "1.1",
+  "access-spack-packages": "api-v2"
 }
diff --git a/spack.yaml b/spack.yaml
index b560db6..d74cc86 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -1,24 +1,34 @@
-# This is a Spack Environment file.
+# This is a Spack Environment file!
 #
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [access-test]
+  - _version: [2025.09.000]
   specs:
-    - access-test@git.2025.09.000
+  - access-test
   packages:
     access-test-component:
       require:
-        - '@main'
+      - '@main'
     openmpi:
       require:
-        - '@4.1.5'
+      - '@4.1.5'
     gcc-runtime:
       require:
-        - '%gcc'
+      - '%access_gcc'
+
+    # Compilers
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
+
     all:
       require:
-        - '%intel@2021.10.0'
-        - 'target=x86_64'
+      - '%access_intel'
+      - 'target=x86_64'
   view: true
   concretizer:
     unify: true