diff --git a/config/versions.json b/config/versions.json
index db8e43b..7341f3a 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,6 @@
 {
-    "$schema": "./versions.schema.json",
-    "spack-packages": "2024.03.22",
-    "spack-config": "2024.03.22"
-}
\ No newline at end of file
+    "$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"
+}
diff --git a/config/versions.schema.json b/config/versions.schema.json
deleted file mode 100644
index 9184352..0000000
--- a/config/versions.schema.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "title": "Deployment Environments",
-    "description": "A list of deployment targets that are supported",
-    "type": "object",
-    "properties": {
-        "$schema": {
-            "type": "string"
-        },
-        "spack-packages": {
-            "type": "string"
-        },
-        "spack-config": {
-            "type": "string"
-        }
-    },
-    "required": [ "$schema", "spack-packages", "spack-config" ],
-    "additionalProperties": false
-}
\ No newline at end of file
diff --git a/spack.yaml b/spack.yaml
index 95ed9cc..6e100e5 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -3,40 +3,66 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
-  definitions:
-  - compilers:
-    - intel@2021.10.0
-  - mpis:
-    - openmpi@4.1.5
-  - serial_packages:
-    - fortranxml@4.1.2
-  - packages:
-    - esmf@8.5.0+debug
-    - parallelio@2.6.2 build_type=RelWithDebInfo fflags='-qno-opt-dynamic-align -convert
-      big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source'
-      cflags='-qno-opt-dynamic-align -fp-model precise -std=gnu99'
-    - netcdf-c@4.9.2 build_system=cmake build_type=RelWithDebInfo
-    - netcdf-fortran@4.6.1
-    - fms@2023.02 precision=64 +large_file +deprecated_io ~gfs_phys ~openmp ~quad_precision
-      build_type=RelWithDebInfo
-    - access-om3 +install_libraries
   specs:
-  - matrix:
-    - [$mpis]
-    - [$%compilers]
-  - matrix:
-    - [$packages]
-    - [$^mpis]
-    - [$%compilers]
-  - matrix:
-    - [$serial_packages]
-    - [$%compilers]
+    - access-om3@git.2024.09.0
+  packages:
+    # Main Dependencies
+    access-om3-nuopc:
+      require:
+        - '@git.0.3.1'
+
+    # Other Dependencies
+    esmf:
+      require:
+        - '@8.5.0'
+    parallelio:
+      require:
+        - '@2.6.2'
+    netcdf-c:
+      require:
+        - '@4.9.2'
+        - build_system=cmake build_type=RelWithDebInfo
+    netcdf-fortran:
+      require:
+        - '@4.6.1'
+    fms:
+      require:
+        - '@2023.02'
+    openmpi:
+      require:
+        - '@4.1.5'
+    fortranxml:
+      require:
+        - '@4.1.2'
+
+    all:
+      require:
+        - '%intel@2021.10.0'
+        - 'target=x86_64'
   view: true
   concretizer:
     unify: true
   modules:
     default:
+      enable:
+        - tcl
       roots:
-        tcl: $spack/../modules/access-om3/0.x.0
+        tcl: $spack/../release/modules
+        lmod: $spack/../release/lmod
       tcl:
-        naming_scheme: '{name}/{version}'
+        hash_length: 0
+        include:
+          - access-om3
+          - access-om3-nuopc
+        exclude_implicits: true
+        all:
+          autoload: direct
+          conflict:
+            - '{name}'
+          environment:
+            set:
+              'SPACK_{name}_ROOT': '{prefix}'
+        projections:
+          all: '{name}/{version}'
+          access-om3: '{name}/2024.09.0'
+          access-om3-nuopc: '{name}/0.3.1'