diff --git a/config/versions.json b/config/versions.json
index 7341f3a..1db5463 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,6 +1,5 @@
 {
     "$schema": "http://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/2-0-0.json",
     "spack": "0.22",
-    "spack-packages": "2024.07.08",
-    "spack-config": "2024.07.05"
+    "spack-packages": "ed25bd497a716cc4edaa867cc14e06dbc3777149"
 }
diff --git a/spack.yaml b/spack.yaml
index f147a59..64f4f87 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -13,16 +13,17 @@ spack:
     # Direct ACCESS-NRI Dependencies
     cice5:
       require:
-        - '@git.2023.10.19'
+        - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.2024.06.27'
+        - '@git.2025.05.000=legacy-access-om2-bgc'
+        - 'build_system=makefile'
     libaccessom2:
       require:
-        - '@git.2023.10.26'
+        - '@git.2025.05.001=access-om2'
     oasis3-mct:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     # Other Dependencies
     netcdf-c:
       require:
@@ -36,6 +37,15 @@ spack:
     openmpi:
       require:
         - '@4.0.2'
+    access-fms:
+      require:
+        - '@git.mom5-2025.05.000=mom5'
+    access-generic-tracers:
+      require:
+        - '@git.dev-2025.05.001=development'
+    access-mocsy:
+      require:
+        - '@git.2017.12.0=mom5'
     all:
       # Enforce these versions rather than a preference, as in 'spack.packages.all.compilers/target'
       require:
@@ -46,31 +56,16 @@ spack:
     unify: true
   modules:
     default:
-      enable:
-      - tcl
-      roots:
-        tcl: $spack/../release/modules
-        lmod: $spack/../release/lmod
       tcl:
-        hash_length: 0
         include:
-        - access-om2-bgc
-        - mom5
-        - cice5
-        - libaccessom2
-        - oasis3-mct
-        exclude_implicits: true
-        all:
-          autoload: run
-          conflict:
-          - '{name}'
-          environment:
-            set:
-              'SPACK_{name}_ROOT': '{prefix}'
+          - access-om2-bgc
+          - mom5
+          - cice5
+          - libaccessom2
+          - oasis3-mct
         projections:
-          all: '{name}/{version}'
           access-om2-bgc: '{name}/2024.07.0'
-          cice5: '{name}/2023.10.19'
-          mom5: '{name}-bgc/2024.06.27'
-          libaccessom2: '{name}/2023.10.26'
-          oasis3-mct: '{name}/2023.11.09'
+          cice5: '{name}/2023.10.19-{hash:7}'
+          mom5: '{name}/2025.05.000-{hash:7}'
+          libaccessom2: '{name}/2025.05.001-{hash:7}'
+          oasis3-mct: '{name}/2023.11.09-{hash:7}'