diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml
index 8d5ae1a7c..c19223565 100644
--- a/configs/sites/tier1/wcoss2/packages.yaml
+++ b/configs/sites/tier1/wcoss2/packages.yaml
@@ -71,6 +71,8 @@
     gsibec:
       require::
       - '@1.2.1 ~mkl'
+    icu4c:
+      require: ['%gcc']
     libffi:
       require:
       - any_of: ['@3.3']
@@ -92,10 +94,6 @@
       require:
       - any_of: ['@0.29.36']
         when: '%intel'
-    py-numpy:
-      require::
-      - '^[virtuals=lapack,blas] openblas'
-      - '@1.26'
     py-pandas:
       'require:': ~excel #   minimize dependencies
     py-scipy:
@@ -116,4 +114,4 @@
     crtm:                                                     
       require: ['@2.4.0.1 +fix']
     scotch:
-      require: ['@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake']
+      require:: ['@7.0.7 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps build_system=cmake']
diff --git a/configs/sites/tier1/wcoss2/packages_intel.yaml b/configs/sites/tier1/wcoss2/packages_intel.yaml
index e2393324c..660802761 100644
--- a/configs/sites/tier1/wcoss2/packages_intel.yaml
+++ b/configs/sites/tier1/wcoss2/packages_intel.yaml
@@ -1,9 +1,11 @@
 packages:
     #
-    ### Set compiler. 
+    ### Set compilers & MPI provider for metamodule generation. 
     # 
     all: 
       compiler:: [intel@19.1.3.304]
+      providers:
+        mpi:: [cray-mpich]
     #
     ### External packages.
     # 
@@ -25,6 +27,14 @@ packages:
     harfbuzz:
       require: ['%gcc']
     ecflow:
-      require:: ['@5.11.4', '+ui', '^boost %gcc', '%intel']
-    py-numpy:
-      require: ['%gcc']
+      require::
+      - '@5.11.4'
+      - '+ui'
+      - 'cflags="-no-ipo" cxxflags="-no-ipo"'
+      - '^boost %gcc'
+      - '%intel'
+    py-numpy::
+      require::
+      - '^[virtuals=lapack,blas] openblas'
+      - '@1.26'
+      - '%gcc'
diff --git a/configs/sites/tier1/wcoss2/packages_oneapi.yaml b/configs/sites/tier1/wcoss2/packages_oneapi.yaml
index a9bb4b49f..56437b7b7 100644
--- a/configs/sites/tier1/wcoss2/packages_oneapi.yaml
+++ b/configs/sites/tier1/wcoss2/packages_oneapi.yaml
@@ -1,6 +1,11 @@
 packages:
+  #
+  ### Set compilers & MPI provider for metamodule generation.
+  #
   all:
     compiler:: [oneapi@2024.2.1]
+    providers:
+      mpi:: [cray-mpich]
   gcc-runtime:
     require: '%gcc@12.1.0'
   cray-mpich:
@@ -31,8 +36,6 @@ packages:
     require: ['@9.4.1']
   libtiff:
     require: ['build_system=cmake']
-  icu4c:
-    require: ['%gcc']
   ninja:
     require: ['~re2c %gcc']
   pixman:
@@ -43,3 +46,7 @@ packages:
     require: ['%gcc']
   zlib-ng:
     require: ['cflags="-static-intel"', 'cxxflags="-static-intel"']
+  py-numpy::
+    require::
+    - '^[virtuals=lapack,blas] openblas'
+    - '@1.26'
diff --git a/configs/templates/nco/spack.yaml b/configs/templates/nco/spack.yaml
index daa20ab72..c72a3aa67 100644
--- a/configs/templates/nco/spack.yaml
+++ b/configs/templates/nco/spack.yaml
@@ -25,7 +25,7 @@ spack:
   - eckit
   - ecmwf-atlas
   - eigen
-  - esmf
+  - esmf@8.8.0
   - fckit
   - fms
   - g2
@@ -53,7 +53,7 @@ spack:
   - libxml2
   - libxrender
   - madis
-  - mapl
+  - mapl@2.53.4 ^esmf@8.8.0
   - mbedtls
   - met
   - metis
diff --git a/spack b/spack
index 9c5291036..f1be10018 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit 9c52910360a5b45d24c85870d5787f4321a5771d
+Subproject commit f1be10018764d95382abcd2adee0d3756c298ac1