diff --git a/build.sh b/build.sh
index 91231f04f..6445f80cf 100755
--- a/build.sh
+++ b/build.sh
@@ -71,7 +71,7 @@ while getopts "p:t:c:hvdfa" opt; do
 done
 
 case ${BUILD_TARGET} in
-  hera | orion | hercules | wcoss2 | noaacloud | gaeac5 | gaeac6 | acorn )
+  hera | orion | hercules | wcoss2 | noaacloud | gaeac5 | gaeac6 )
     echo "Building GDASApp on $BUILD_TARGET"
     source $dir_root/ush/module-setup.sh
     module use $dir_root/modulefiles
diff --git a/modulefiles/GDAS/acorn.intel.lua b/modulefiles/GDAS/acorn.intel.lua
deleted file mode 100644
index 13a1d795d..000000000
--- a/modulefiles/GDAS/acorn.intel.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-help([[
-Load environment for running the GDAS application with Intel compilers and MPI.
-]])
-
-local pkgName    = myModuleName()
-local pkgVersion = myModuleVersion()
-local pkgNameVer = myModuleFullName()
-
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-
-load("PrgEnv-intel/8.2.0")
-load("cmake/3.20.2")
-load("craype/2.7.17")
-load("cray-pals/1.2.2")
-load("git/2.35.3")
-load("stack-intel/19.1.3.304")
-load("stack-cray-mpich/8.1.9")
-load("hdf5/1.14.0")
-load("parallel-netcdf/1.12.2")
-load("netcdf-c/4.9.2")
-load("netcdf-fortran/4.6.1")
-load("netcdf-cxx4/4.3.1")
-load("udunits/2.2.28")
-load("eigen/3.4.0")
-load("boost/1.79.0")
-load("gsl-lite/v0.40.0")
-load("sp/2.5.0")
-load("python/3.10.13")
-load("ecbuild/3.7.2")
-load("qhull/2020.2")
-load("eckit/1.24.4")
-load("fckit/0.11.0")
-load("atlas/0.35.0")
-load("nccmp/1.9.0.1")
-load("nco/5.0.6")
-load("gsl/2.7")
-load("prod_util/2.0.14")
-load("bufr/12.0.1")
-load("fms-C/2023.04")
-load("esmf-C/8.6.0")
-
-unload("python/3.10.13")
-load("python/3.8.6")
-
--- hack for pybind11
-setenv("pybind11_ROOT", "/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib/python3.8/site-packages/pybind11/share/cmake/pybind11")
-
--- hack for git-lfs
-prepend_path("PATH", "/apps/spack/git-lfs/2.11.0/gcc/11.2.0/m6b6nl5kfqngfteqbggydc7kflxere3s/bin")
-
--- hack for FMS
-setenv("fms_ROOT", "/apps/prod/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0pnetcdf/intel-19.1.3.304/cray-mpich-8.1.12/fms/2023.04")
-
-local mpiexec = '/pe/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpirun'
-local mpinproc = '-n'
-setenv('MPIEXEC_EXEC', mpiexec)
-setenv('MPIEXEC_NPROC', mpinproc)
-
-setenv("CRTM_FIX","/lfs/h2/emc/da/noscrub/emc.da/GDASApp/fix/crtm/2.4.0")
-setenv("GDASAPP_TESTDATA","/lfs/h2/emc/da/noscrub/emc.da/GDASApp/testdata")
-setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/lfs/h2/emc/da/noscrub/emc.da/GDASApp/unittestdata")
-
-whatis("Name: ".. pkgName)
-whatis("Version: ".. pkgVersion)
-whatis("Category: GDASApp")
-whatis("Description: Load all libraries needed for GDASApp")
diff --git a/modulefiles/GDAS/wcoss2.intel.lua b/modulefiles/GDAS/wcoss2.intel.lua
index 2b133122a..b7d042233 100644
--- a/modulefiles/GDAS/wcoss2.intel.lua
+++ b/modulefiles/GDAS/wcoss2.intel.lua
@@ -3,55 +3,86 @@ Load environment for running the GDAS application with Intel compilers and MPI.
 ]])
 
 local pkgName    = myModuleName()
-local pkgVersion = myModuleVersion()
+local pkgVersion = myModuleVersion() or "1.0"
 local pkgNameVer = myModuleFullName()
 
 prepend_path("MODULEPATH", "/apps/ops/test/spack-stack-1.6.0-nco/envs/nco-intel-19.1.3.304/install/modulefiles/Core")
 
-load("PrgEnv-intel/8.2.0")
-load("cmake/3.20.2")
-load("craype/2.7.17")
-load("cray-pals/1.2.2")
-load("git/2.35.3")
+load("PrgEnv-intel/8.3.3")
 load("stack-intel/19.1.3.304")
 load("stack-cray-mpich/8.1.9")
+load("stack-python/3.10.13")
+load("craype/2.7.17")
+load("cray-pals/1.3.2")
+load("cmake/3.23.1")
+load("gettext/0.19.7")
+load("pcre2/10.42")
+load("curl/8.4.0")
+load("zlib/1.2.13")
+load("git/2.35.3")
+load("pkg-config/0.29.2")
 load("hdf5/1.14.0")
 load("parallel-netcdf/1.12.2")
 load("netcdf-c/4.9.2")
+load("nccmp/1.9.0.1")
 load("netcdf-fortran/4.6.1")
-load("netcdf-cxx4/4.3.1")
-load("udunits/2.2.28")
-load("eigen/3.4.0")
-load("boost/1.79.0")
-load("gsl-lite/v0.40.0")
-load("sp/2.5.0")
-load("python/3.10.13")
+load("nco/5.0.6")
+load("parallelio/2.5.10")
+load("boost/1.83.0")
+load("bufr/12.0.1")
 load("ecbuild/3.7.2")
-load("qhull/2020.2")
-load("eckit/1.24.4")
+load("openjpeg/2.5.0")
+load("eigen/3.4.0")
+load("openblas/0.3.24")
+load("eckit/1.24.5")
+load("fftw/3.3.10")
 load("fckit/0.11.0")
+load("fms/2023.04")
+load("esmf/8.5.0")
 load("atlas/0.35.0")
-load("nccmp/1.9.0.1")
-load("nco/5.0.6")
-load("gsl/2.7")
+load("sp/2.5.0")
+load("gsl-lite/0.37.0")
+load("libjpeg/2.1.0")
+load("libpng/1.6.37")
+load("libxt/1.1.5")
+load("libxmu/1.1.4")
+load("libxpm/3.5.12")
+load("libxaw/1.0.13")
+load("udunits/2.2.28")
+load("ncview/2.1.9")
+load("netcdf-cxx4/4.3.1")
+load("core/rocoto/1.3.5")
 load("prod_util/2.0.14")
-load("bufr/12.0.1")
-load("fms-C/2023.04")
-load("esmf-C/8.6.0")
-
-unload("python/3.10.13")
-load("python/3.8.6")
 
--- hack for pybind11
-setenv("pybind11_ROOT", "/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib/python3.8/site-packages/pybind11/share/cmake/pybind11")
+load("py-setuptools/63.4.3")
+load("py-jinja2/3.1.2")
+load("py-netcdf4/1.5.8")
+load("py-pybind11/2.11.1")
+load("py-pycodestyle/2.11.0")
+load("py-pyyaml/5.4.1")
+load("py-scipy/1.10.1")
+load("py-xarray/2023.7.0")
+load("py-f90nml/1.4.3")
+load("py-pip/23.1.2")
+load("py-bottleneck/1.3.7")
+load("py-numexpr/2.8.4")
+load("py-six/1.16.0")
+load("py-python-dateutil/2.8.2")
+load("py-pytz/2023.3")
+load("py-pandas/1.5.3")
+load("py-numpy/1.24.4")
+load("py-markupsafe/2.1.3")
+load("py-cftime/1.0.3.4")
+load("py-packaging/23.1")
 
 -- hack for git-lfs
 prepend_path("PATH", "/apps/spack/git-lfs/2.11.0/gcc/11.2.0/m6b6nl5kfqngfteqbggydc7kflxere3s/bin")
 
--- hack for FMS
-setenv("fms_ROOT", "/apps/prod/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0pnetcdf/intel-19.1.3.304/cray-mpich-8.1.12/fms/2023.04")
+setenv("CC","cc")
+setenv("CXX","CC")
+setenv("FC","ftn")
 
-local mpiexec = '/pe/intel/compilers_and_libraries_2020.4.304/linux/mpi/intel64/bin/mpirun'
+local mpiexec = '/opt/cray/pals/1.3.2/bin/mpirun'
 local mpinproc = '-n'
 setenv('MPIEXEC_EXEC', mpiexec)
 setenv('MPIEXEC_NPROC', mpinproc)
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index a9b87e9e4..11536daf3 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -38,6 +38,8 @@ elif [[ $MACHINE_ID = s4* ]] ; then
 
 elif [[ $MACHINE_ID = wcoss2 ]]; then
     # We are on WCOSS2
+    # Ignore default modules of the same version lower in the search path (req'd by spack-stack)
+    export LMOD_TMOD_FIND_FIRST=yes
     module reset
 
 elif [[ $MACHINE_ID = cheyenne* ]] ; then