diff --git a/.gitmodules b/.gitmodules
index 160ccb9d4..82ae4248d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "spack"]
   path = spack
   url = https://github.com/jcsda/spack
-  branch = spack-stack-1.9.2rc1
+  branch = release/1.9.0
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index 2543dac54..6f7c763e4 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -160,7 +160,7 @@ packages:
   magics:
     require: "@4.15.3:"
   mapl:
-    require: '@2.53.0 ~shared ~f2py'
+    require: '@2.53 ~shared ~f2py'
     variants: '+pflogger'
   met:
     require: '@11.1.1 +python +grib2'
@@ -265,9 +265,11 @@ packages:
   py-urllib3:
     require: '@1.26.12'
   qt:
-    require: '@5'
+    require:
+    - '@5'
   scotch:
-    require: '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps'
+    require:
+    - '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps'
   sfcio:
     require: '@1.4.2'
   shumlib:
diff --git a/configs/common/packages_oneapi.yaml b/configs/common/packages_oneapi.yaml
index f148f1ecf..54398f5a1 100644
--- a/configs/common/packages_oneapi.yaml
+++ b/configs/common/packages_oneapi.yaml
@@ -24,3 +24,6 @@ packages:
   qt:
     require:
     - '%gcc'
+  scotch:
+    require:
+    - '%gcc'
diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml
index 7072243cc..d61dc8ce9 100644
--- a/configs/containers/specs/jedi-ci.yaml
+++ b/configs/containers/specs/jedi-ci.yaml
@@ -48,7 +48,7 @@
     w3emc@2.10.0,
     nco,
     esmf@8.8.0,
-    mapl@2.53.0,
+    mapl@2.53.4,
     zlib-ng,
     zstd,
     odc@1.5.2,
diff --git a/configs/sites/tier1/ursa/compilers.yaml b/configs/sites/tier1/ursa/compilers.yaml
index 9ede62d18..914a17471 100644
--- a/configs/sites/tier1/ursa/compilers.yaml
+++ b/configs/sites/tier1/ursa/compilers.yaml
@@ -8,6 +8,7 @@ compilers:
       fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/ifort
     flags: {}
     operating_system: rocky9
+    target: x86_64
     modules:
     - intel-oneapi-compilers/2024.2.1
     environment:
@@ -26,6 +27,7 @@ compilers:
       fc:  /usr/bin/gfortran
     flags: {}
     operating_system: rocky9
+    target: x86_64
     modules: []
     environment: {}
     extra_rpaths: []
diff --git a/configs/sites/tier1/ursa/packages_gcc.yaml b/configs/sites/tier1/ursa/packages_gcc.yaml
index d6c5aa362..e010f37e7 100644
--- a/configs/sites/tier1/ursa/packages_gcc.yaml
+++ b/configs/sites/tier1/ursa/packages_gcc.yaml
@@ -11,14 +11,8 @@ packages:
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-auzmzlihoo7n6g254nqkguxtzrdzkyqv
       modules:
       - openmpi/4.1.6
+  gcc-runtime:
+    externals:
+    - spec: gcc-runtime@11.4.1%gcc@11.4.1
+      prefix: /usr
 
-  ectrans:
-    require::
-    - '~mkl +fftw'
-  gsibec:
-    require::
-    - '~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/sites/tier1/ursa/packages_oneapi.yaml b/configs/sites/tier1/ursa/packages_oneapi.yaml
index cf3502aa2..f44e67167 100644
--- a/configs/sites/tier1/ursa/packages_oneapi.yaml
+++ b/configs/sites/tier1/ursa/packages_oneapi.yaml
@@ -1,6 +1,6 @@
 packages:
   all:
-    compiler:: [oneapi@2024.2.1]
+    compiler:: [oneapi@2024.2.1,gcc@11.4.1]
     providers:
       mpi:: [intel-oneapi-mpi@2021.13]
       # Change as appropriate to switch to intel-oneapi-mkl
@@ -16,22 +16,20 @@ packages:
       modules:
       - intel-oneapi-mpi/2021.13.1
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-ss72gbndvat3oz22sa6lhmlbjkeabrn4
-
+  intel-oneapi-mkl:
+    externals:
+    - spec: intel-oneapi-mkl@2024.2.1%oneapi@2024.2.1
+      modules:
+      - intel-oneapi-mkl/2024.2.1
+      prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat
   intel-oneapi-runtime:
     externals:
     - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
       prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2
       modules:
       - compiler-rt/2024.2.1
+  gcc-runtime:
+    externals:
+    - spec: gcc-runtime@11.4.1%gcc@11.4.1
+      prefix: /usr
 
-  # If using intel-oneapi-mkl, make appropriate changes below
-  ectrans:
-    require::
-    - '~mkl +fftw'
-  gsibec:
-    require::
-    - '~mkl'
-  py-numpy:
-    require::
-    - '@1.26'
-    - '^openblas'
diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml
index f29430cb5..11c056e6b 100644
--- a/configs/templates/skylab-dev/spack.yaml
+++ b/configs/templates/skylab-dev/spack.yaml
@@ -28,7 +28,7 @@ spack:
 
     # Mapl with various esmf tags
     - mapl@2.53.0 ^esmf@8.6.1
-    - mapl@2.53.0 ^esmf@8.8.0
+    - mapl@2.53.4 ^esmf@8.8.0
 
     # Various esmf tags (list all to avoid duplicate packages)
     - esmf@=8.6.1 snapshot=none
diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml
index a56a37dbc..2badbba65 100644
--- a/configs/templates/unified-dev/spack.yaml
+++ b/configs/templates/unified-dev/spack.yaml
@@ -34,7 +34,7 @@ spack:
 
     # Mapl with various esmf tags
     - mapl@2.53.0 ^esmf@8.6.1
-    - mapl@2.53.0 ^esmf@8.8.0
+    - mapl@2.53.4 ^esmf@8.8.0
 
     # Various esmf tags (list all to avoid duplicate packages)
     - esmf@=8.6.1 snapshot=none
diff --git a/spack b/spack
index 1ef7450f5..9c5291036 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 1ef7450f5e0f8401cb0ec8beadd273581d0a40fd
+Subproject commit 9c52910360a5b45d24c85870d5787f4321a5771d