diff --git a/modulefiles/gsi_common_wcoss2.lua b/modulefiles/gsi_common_wcoss2.lua
new file mode 100644
index 0000000000..12d4efd5c6
--- /dev/null
+++ b/modulefiles/gsi_common_wcoss2.lua
@@ -0,0 +1,35 @@
+help([[
+Load common modules to build GSI on all machines
+]])
+
+local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+
+local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
+local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1"
+local sp_ver=os.getenv("sp_ver") or "2.3.3"
+local ip_ver=os.getenv("ip_ver") or "3.3.3"
+local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
+local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
+local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
+local crtm_ver=os.getenv("crtm_ver") or "2.4.0"
+local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"
+
+load("netcdf-c")
+load("netcdf-fortran")
+
+load("bufr/11.7.0")
+load("bacio")
+load("w3emc")
+load("sp")
+load("ip/3.3.3")
+load("sigio")
+load("sfcio")
+load("nemsio")
+load("wrf-io")
+load("ncio")
+load("crtm")
+load(pathJoin("gsi-ncdiag",ncdiag_ver))
+
diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua
index 652e0de1db..a225514e85 100644
--- a/modulefiles/gsi_wcoss2.lua
+++ b/modulefiles/gsi_wcoss2.lua
@@ -1,34 +1,21 @@
 help([[
 ]])
 
-local PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
-local intel_ver=os.getenv("intel_ver") or "19.1.3.304"
-local craype_ver=os.getenv("craype_ver") or "2.7.8"
-local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
-local cmake_ver= os.getenv("cmake_ver") or "3.20.2"
-local python_ver=os.getenv("python_ver") or "3.8.6"
-local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
-
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack")
-local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-local hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.9"
-
-load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
-load(pathJoin("intel", intel_ver))
-load(pathJoin("craype", craype_ver))
-load(pathJoin("cray-mpich", cray_mpich_ver))
-load(pathJoin("cmake", cmake_ver))
-load(pathJoin("python", python_ver))
-
-load(pathJoin("prod_util", prod_util_ver))
-
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-intel", hpc_intel_ver))
-load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
-
-load("gsi_common")
 
+load("PrgEnv-intel")
+load("intel")
+load("craype")
+load("cray-mpich")
+load("cmake")
+
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/Mark.Potts/spack-stack/spack-stack-1.4.1/envs/unified-dev-19/install/modulefiles/Core")
+load("stack-intel")
+load("stack-cray-mpich")
+load("prod-util")
+load("gsi_common_wcoss2")
+
+setenv("CC", "cc")
+setenv("CXX", "CC")
+setenv("FC", "ftn")
 pushenv("GSI_BINARY_SOURCE_DIR", "/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/gsi/20230601")
-
-whatis("Description: GSI environment on WCOSS2")
+whatis("Description: GSI environment on Hera with Intel Compilers")
diff --git a/regression/regression_driver.sh b/regression/regression_driver.sh
index e1d3b18dc7..821cc7cedb 100755
--- a/regression/regression_driver.sh
+++ b/regression/regression_driver.sh
@@ -35,9 +35,11 @@ for jn in `seq ${RSTART} ${REND}`; do
    if [ $jn -le 2 ]; then
       export scripts=${scripts_updat:-$scripts}
       export fixgsi=${fixgsi_updat:-$fixgsi}
+      export modulefiles=${modulefiles_updat:-$modulefiles}
    else
       export scripts=${scripts_contrl:-$scripts}
       export fixgsi=${fixgsi_contrl:-$fixgsi}
+      export modulefiles=${modulefiles_contrl:-$modulefiles}
    fi
    rm -f ${job[$jn]}.out
 
diff --git a/regression/regression_var.sh b/regression/regression_var.sh
index d94e53a04d..3176372a3b 100755
--- a/regression/regression_var.sh
+++ b/regression/regression_var.sh
@@ -14,6 +14,7 @@ if [ "$#" = 7 ] ; then
   export enkfexec_contrl=$7
   export fixgsi="$gsisrc/fix"
   export scripts="$gsisrc/regression"
+  export modulefiles="$gsisrc/modulefiles"
   export ush="$gsisrc/ush"
   export cmaketest="true"
   export clean="false"
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index 776f7a0b86..6f0673ce29 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -3,7 +3,7 @@
 case $(hostname -f) in
 
   adecflow0[12].acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=wcoss2 ;; ### acorn
-  alogin0[12].acorn.wcoss2.ncep.noaa.gov)    MACHINE_ID=wcoss2 ;; ### acorn
+  alogin0[1-3].acorn.wcoss2.ncep.noaa.gov)   MACHINE_ID=wcoss2 ;; ### acorn
   clogin0[1-9].cactus.wcoss2.ncep.noaa.gov)  MACHINE_ID=wcoss2 ;; ### cactus01-9
   clogin10.cactus.wcoss2.ncep.noaa.gov)      MACHINE_ID=wcoss2 ;; ### cactus10
   dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood01-9
diff --git a/ush/sub_wcoss2 b/ush/sub_wcoss2
index 57115ef7c6..f41fd305e9 100755
--- a/ush/sub_wcoss2
+++ b/ush/sub_wcoss2
@@ -115,6 +115,7 @@ echo "#PBS -j oe"                          >> $cfile
 echo "#PBS -A "$accnt                      >> $cfile
 
 echo "" >> $cfile
+echo "set -x" >> $cfile 
 echo "export OMP_NUM_THREADS=$threads"      >> $cfile
 echo "export ntasks=$(( $nodes * $procs ))" >> $cfile
 echo "export ppn=$procs"                    >> $cfile
@@ -123,19 +124,14 @@ echo "" >> $cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out)  >>$cfile
 echo "" >> $cfile
 
-echo "module purge"                        >> $cfile
-echo "module load envvar/1.0"              >> $cfile
-echo "module load PrgEnv-intel/8.2.0"      >> $cfile
-echo "module load intel/19.1.3.304"        >> $cfile
-echo "module load craype/2.7.13"           >> $cfile
-echo "module load cray-mpich/8.1.12"       >> $cfile
-echo "module load cray-pals/1.1.3"         >> $cfile
-echo "module load prod_util/2.0.14"        >> $cfile
-echo "module load prod_envir/2.0.6"        >> $cfile
-echo "module load crtm/2.4.0"              >> $cfile
-echo "module load cfp/2.0.4"               >> $cfile
-echo "module load netcdf/4.7.4"            >> $cfile
-echo "module list"                         >> $cfile
+echo "module reset"                         >> $cfile
+echo "module use $modulefiles"              >> $cfile
+echo "module load gsi_wcoss2"               >> $cfile
+echo "module load envvar/1.0"               >> $cfile
+echo "module load cray-pals/1.2.2"          >> $cfile
+echo "module -t list 2>&1 | while read line;do module show $line 2>&1 | sed -n -e '2p';done | sort" >> $cfile
+echo "module avail" >> $cfile
+
 echo "" >> $cfile
 
 cat $exec >> $cfile