diff --git a/ci/spack.yaml b/ci/spack.yaml
index 567d894a9..3985e540f 100644
--- a/ci/spack.yaml
+++ b/ci/spack.yaml
@@ -7,15 +7,15 @@ spack:
   - netcdf-c@4.9.2
   - netcdf-fortran@4.6.1
   - bacio@2.4.1
-  - g2@3.4.5
-  - ip@4.4.0 precision=d
-  - nemsio@2.5.4
+  - g2@3.5.1
+  - ip@5.1.0 precision=d
   - sp@2.5.0
+  - nemsio@2.5.4
   - w3emc@2.10.0
   - sigio@2.3.3
   - nccmp@1.9.0.1
   - parallelio@2.5.10+fortran~pnetcdf
-  - esmf@8.6.0
+  - esmf@8.8.0
   view: true
   concretizer:
     unify: when_possible
diff --git a/modulefiles/build.gaeac6.intel.lua b/modulefiles/build.gaeac6.intel.lua
index c236bb282..67539ba56 100644
--- a/modulefiles/build.gaeac6.intel.lua
+++ b/modulefiles/build.gaeac6.intel.lua
@@ -5,15 +5,15 @@ Load environment to compile UFS_UTILS on Gaea C6 using Intel
 prepend_path("MODULEPATH", "/usw/hpss/modulefiles")
 load("hsi")
 
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -22,7 +22,7 @@ load(pathJoin("bacio", bacio_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.1.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -35,10 +35,10 @@ w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
 -- Uncomment when CHGRES_ALL is ON
---sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 --load(pathJoin("sfcio", sfcio_ver))
 
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
 load(pathJoin("sigio", sigio_ver))
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.13"
@@ -56,10 +56,10 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.2.4"
 load(pathJoin("nco", nco_ver))
 
 unload("cray-libsci")
diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua
new file mode 100644
index 000000000..2fadb07dd
--- /dev/null
+++ b/modulefiles/build.hera.intel.lua
@@ -0,0 +1,62 @@
+help([[
+Load environment to compile UFS_UTILS on Ursa using Intelllvm
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+
+stack_oneapi_mpi_ver=os.getenv("stack_oneapi_mpi_ver") or "2021.13"
+load(pathJoin("stack-intel-oneapi-mpi", stack_oneapi_mpi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+load(pathJoin("cmake", cmake_ver))
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.5.1"
+load(pathJoin("g2", g2_ver))
+
+ip_ver=os.getenv("ip_ver") or "5.1.0"
+load(pathJoin("ip", ip_ver))
+
+nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
+load(pathJoin("nemsio", nemsio_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.5.0"
+load(pathJoin("sp", sp_ver))
+
+w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
+load(pathJoin("w3emc", w3emc_ver))
+
+-- Uncomment when CHGRES_ALL is ON
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--load(pathJoin("sfcio", sfcio_ver))
+
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
+load(pathJoin("sigio", sigio_ver))
+
+netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+load(pathJoin("netcdf-c", netcdf_c_ver))
+
+netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.6.1"
+load(pathJoin("esmf", esmf_ver))
+
+nco_ver=os.getenv("nco_ver") or "5.2.4"
+load(pathJoin("nco", nco_ver))
+
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_FC", "ifort")
+
+setenv("CC", "mpiicc")
+setenv("FC", "mpiifort")
+
+whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.hercules.intel.lua b/modulefiles/build.hercules.intel.lua
index 277909359..df0e3d417 100644
--- a/modulefiles/build.hercules.intel.lua
+++ b/modulefiles/build.hercules.intel.lua
@@ -2,15 +2,15 @@ help([[
 Load environment to compile UFS_UTILS on Hercules using Intel Classic
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -19,7 +19,7 @@ load(pathJoin("bacio", bacio_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.1.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -32,10 +32,10 @@ w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
 -- Uncomment when CHGRES_ALL is ON
---sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 --load(pathJoin("sfcio", sfcio_ver))
 
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
 load(pathJoin("sigio", sigio_ver))
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.13"
@@ -53,10 +53,16 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.2.4"
 load(pathJoin("nco", nco_ver))
 
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_F90", "ifort")
+
+setenv("CC", "mpiicx")
+setenv("FC", "mpiifort")
+
 whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.hercules.intelllvm.lua b/modulefiles/build.hercules.intelllvm.lua
index eeddf7966..78b64d13f 100644
--- a/modulefiles/build.hercules.intelllvm.lua
+++ b/modulefiles/build.hercules.intelllvm.lua
@@ -2,15 +2,15 @@ help([[
 Load environment to compile UFS_UTILS on Hercules using IntelLLVM
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -19,7 +19,7 @@ load(pathJoin("bacio", bacio_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.1.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -32,10 +32,10 @@ w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
 -- Uncomment when CHGRES_ALL is ON
---sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 --load(pathJoin("sfcio", sfcio_ver))
 
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
 load(pathJoin("sigio", sigio_ver))
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.13"
@@ -53,16 +53,16 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.2.4"
 load(pathJoin("nco", nco_ver))
 
 setenv("I_MPI_CC", "icx")
 setenv("I_MPI_F90", "ifx")
 
-setenv("CC", "mpiicc")
-setenv("FC", "mpiifort")
+setenv("CC", "mpiicx")
+setenv("FC", "mpiifx")
 
 whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua
index b7fc2befc..339b4385f 100644
--- a/modulefiles/build.orion.intel.lua
+++ b/modulefiles/build.orion.intel.lua
@@ -2,15 +2,15 @@ help([[
 Load environment to compile UFS_UTILS on Orion using Intel classic
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -19,7 +19,7 @@ load(pathJoin("bacio", bacio_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.1.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -32,10 +32,10 @@ w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
 -- Uncomment when CHGRES_ALL is ON
---sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 --load(pathJoin("sfcio", sfcio_ver))
 
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
 load(pathJoin("sigio", sigio_ver))
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.13"
@@ -53,10 +53,16 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.2.4"
 load(pathJoin("nco", nco_ver))
 
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_F90", "ifort")
+
+setenv("CC", "mpiicx")
+setenv("FC", "mpiifort")
+
 whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.orion.intelllvm.lua b/modulefiles/build.orion.intelllvm.lua
index e32178289..c78e8820c 100644
--- a/modulefiles/build.orion.intelllvm.lua
+++ b/modulefiles/build.orion.intelllvm.lua
@@ -2,15 +2,15 @@ help([[
 Load environment to compile UFS_UTILS on Orion using IntelLLVM
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -19,7 +19,7 @@ load(pathJoin("bacio", bacio_ver))
 g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.1.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -32,10 +32,10 @@ w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
 -- Uncomment when CHGRES_ALL is ON
---sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 --load(pathJoin("sfcio", sfcio_ver))
 
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+sigio_ver=os.getenv("sigio_ver") or "2.3.3"
 load(pathJoin("sigio", sigio_ver))
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.13"
@@ -53,16 +53,16 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.2.4"
 load(pathJoin("nco", nco_ver))
 
 setenv("I_MPI_CC", "icx")
 setenv("I_MPI_F90", "ifx")
 
-setenv("CC", "mpiicc")
-setenv("FC", "mpiifort")
+setenv("CC", "mpiicx")
+setenv("FC", "mpiifx")
 
 whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.wcoss2.intel.lua b/modulefiles/build.wcoss2.intel.lua
index e5f179e73..01f5e92bd 100644
--- a/modulefiles/build.wcoss2.intel.lua
+++ b/modulefiles/build.wcoss2.intel.lua
@@ -14,9 +14,13 @@ load(pathJoin("craype", craype_ver))
 intel_ver=os.getenv("intel_ver") or "19.1.3.304"
 load(pathJoin("intel", intel_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.12"
+cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.19"
 load(pathJoin("cray-mpich", cray_mpich_ver))
 
+-- Need the cray library path for C MPI libraries
+local cray_lib_path=os.getenv("CRAY_LD_LIBRARY_PATH") or ""
+prepend_path("LD_LIBRARY_PATH", cray_lib_path)
+
 libjpeg_ver=os.getenv("libjpeg_ver") or "9c"
 load(pathJoin("libjpeg", libjpeg_ver))
 
@@ -27,10 +31,13 @@ libpng_ver=os.getenv("libpng_ver") or "1.6.37"
 load(pathJoin("libpng", libpng_ver))
 
 hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
-load(pathJoin("hdf5-C", hdf5_ver))
+load(pathJoin("hdf5-D", hdf5_ver))
 
 netcdf_ver=os.getenv("netcdf_ver") or "4.9.2"
-load(pathJoin("netcdf-C", netcdf_ver))
+load(pathJoin("netcdf-D", netcdf_ver))
+
+netcdf_ver=os.getenv("pnetcdf_ver") or "1.12.2"
+load(pathJoin("pnetcdf-D", netcdf_ver))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
@@ -51,7 +58,7 @@ load(pathJoin("sigio", sigio_ver))
 sp_ver=os.getenv("sp_ver") or "2.4.0"
 load(pathJoin("sp", sp_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.0.0"
+ip_ver=os.getenv("ip_ver") or "5.2.0"
 load(pathJoin("ip", ip_ver))
 
 g2_ver=os.getenv("g2_ver") or "3.5.1"
@@ -72,7 +79,7 @@ load(pathJoin("gsl", gsl_ver))
 nco_ver=os.getenv("nco_ver") or "5.0.6"
 load(pathJoin("nco", nco_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
-load(pathJoin("esmf-C", esmf_ver))
+esmf_ver=os.getenv("esmf_ver") or "8.8.0"
+load(pathJoin("esmf-D", esmf_ver))
 
 whatis("Description: UFS_UTILS build environment")
diff --git a/reg_tests/chgres_cube/driver.wcoss2.sh b/reg_tests/chgres_cube/driver.wcoss2.sh
index e38af7278..6cfc61640 100755
--- a/reg_tests/chgres_cube/driver.wcoss2.sh
+++ b/reg_tests/chgres_cube/driver.wcoss2.sh
@@ -30,8 +30,7 @@ source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.$compiler
 # load nccmp
-module load netcdf
-module load nccmp
+module load nccmp-D/1.9.0.1
 module list
 
 export OUTDIR="${WORK_DIR:-/lfs/h2/emc/stmp/$LOGNAME}"
diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh
index 41d932efa..ca499347a 100755
--- a/reg_tests/cpld_gridgen/rt.sh
+++ b/reg_tests/cpld_gridgen/rt.sh
@@ -169,8 +169,7 @@ fi
 module use $PATHTR/modulefiles
 module load build.$target.$compiler
 if [[ $target = wcoss2 ]]; then
-  module load netcdf
-  module load nccmp
+  module load nccmp-D/1.9.0.1
 fi
 set +x
 module list
diff --git a/reg_tests/global_cycle/driver.wcoss2.sh b/reg_tests/global_cycle/driver.wcoss2.sh
index 4c4d8c564..76184ed8f 100755
--- a/reg_tests/global_cycle/driver.wcoss2.sh
+++ b/reg_tests/global_cycle/driver.wcoss2.sh
@@ -25,8 +25,7 @@ compiler=${compiler:-"intel"}
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.$compiler
-module load netcdf
-module load nccmp
+module load nccmp-D/1.9.0.1
 module list
 
 WORK_DIR="${WORK_DIR:-/lfs/h2/emc/stmp/$LOGNAME}"
diff --git a/reg_tests/grid_gen/driver.wcoss2.sh b/reg_tests/grid_gen/driver.wcoss2.sh
index d20ffdf7f..67f540c9e 100755
--- a/reg_tests/grid_gen/driver.wcoss2.sh
+++ b/reg_tests/grid_gen/driver.wcoss2.sh
@@ -24,8 +24,7 @@ compiler=${compiler:-"intel"}
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.$compiler
-module load netcdf
-module load nccmp
+module load nccmp-D/1.9.0.1
 module list
 
 set -x
diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh
index 8ab6a7fe7..afeaf16cd 100755
--- a/reg_tests/ice_blend/driver.orion.sh
+++ b/reg_tests/ice_blend/driver.orion.sh
@@ -32,8 +32,8 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intelllvm
-module load grib-util/1.3.0
-module load wgrib2/2.0.8
+module load grib-util/1.4.0
+module load wgrib2/3.6.0
 module list
 
 ulimit -s unlimited
diff --git a/reg_tests/ocnice_prep/rt.sh b/reg_tests/ocnice_prep/rt.sh
index 8907ac424..b2f04d28c 100755
--- a/reg_tests/ocnice_prep/rt.sh
+++ b/reg_tests/ocnice_prep/rt.sh
@@ -176,8 +176,7 @@ fi
 module use $PATHTR/modulefiles
 module load build.$target.$compiler
 if [[ $target = wcoss2 ]]; then
-  module load netcdf
-  module load nccmp/1.8.9.0
+  module load nccmp-D/1.9.0.1
 fi
 set +x
 module list
diff --git a/reg_tests/regrid_sfc/driver.sh b/reg_tests/regrid_sfc/driver.sh
index babc44dfa..0505bdf89 100755
--- a/reg_tests/regrid_sfc/driver.sh
+++ b/reg_tests/regrid_sfc/driver.sh
@@ -33,8 +33,7 @@ if [[ "$compiler" == "intelllvm" ]]; then
 fi
 module load build.$target.$compiler
 if [[ "$target" == "wcoss2" ]];then
-  module load netcdf
-  module load nccmp
+  module load nccmp-D/1.9.0.1
 fi
 set +x
 module list
diff --git a/reg_tests/snow2mdl/driver.orion.sh b/reg_tests/snow2mdl/driver.orion.sh
index 86735d6bb..df6415c22 100755
--- a/reg_tests/snow2mdl/driver.orion.sh
+++ b/reg_tests/snow2mdl/driver.orion.sh
@@ -23,8 +23,8 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intelllvm
-module load grib-util/1.3.0
-module load wgrib2/2.0.8
+module load grib-util/1.4.0
+module load wgrib2/3.6.0
 module load prod_util/2.1.1
 module list
 
diff --git a/reg_tests/weight_gen/driver.wcoss2.sh b/reg_tests/weight_gen/driver.wcoss2.sh
index 720100d04..a6536d779 100755
--- a/reg_tests/weight_gen/driver.wcoss2.sh
+++ b/reg_tests/weight_gen/driver.wcoss2.sh
@@ -35,8 +35,7 @@ compiler=${compiler:-"intel"}
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.$compiler
-module load netcdf
-module load nccmp
+module load nccmp-D/1.9.0.1
 module list
 
 export DATA="${WORK_DIR:-/lfs/h2/emc/stmp/$LOGNAME}"
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index 067ef0114..46f712b49 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -35,14 +35,18 @@ elif [[ -d /opt/spack-stack && -v SINGULARITY_CONTAINER ]]; then
     source /usr/lmod/lmod/init/$__ms_shell
     target=container
     module purge
-elif [[ -d /scratch3 ]] ; then
-    # We are on NOAA Ursa
+elif [[ -d /scratch3 ]]; then
+    # We are on NOAA Hera or Ursa
+    mount=$(findmnt -n -o SOURCE /home)
+    if [[ ${mount} =~ "ursa" ]]; then
+      target=ursa
+    else
+      target=hera
+    fi
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         echo load the module command 1>&2
         source /apps/lmod/lmod/init/$__ms_shell
     fi
-    target=ursa
-    module purge
 elif [[ "$(hostname)" == "gaea6"* || "$(hostname)" =~ c6n[0-9]+ ]] && [[ -d /gpfs/f6 ]] ; then
     target=gaeac6
     source /opt/cray/pe/lmod/8.7.31/init/$__ms_shell