diff --git a/modulefiles/gsi_wcoss2.lua b/modulefiles/gsi_wcoss2.lua
index d3d72a284f..1872f89d17 100644
--- a/modulefiles/gsi_wcoss2.lua
+++ b/modulefiles/gsi_wcoss2.lua
@@ -1,20 +1,25 @@
 help([[
 ]])
 
-load("PrgEnv-intel")
-load("intel")
-load("craype")
-load("cray-mpich")
-load("cmake")
+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.7"
+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/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")
+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("gsi_common")
 
-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 Hera with Intel Compilers")
+
+whatis("Description: GSI environment on WCOSS2")