diff --git a/modulefiles/EVA/wcoss2.lua b/modulefiles/EVA/wcoss2.lua
new file mode 100644
index 000000000..b604dcdbf
--- /dev/null
+++ b/modulefiles/EVA/wcoss2.lua
@@ -0,0 +1,25 @@
+help([[
+Load environment for running EVA.
+]])
+
+local pkgName    = myModuleName()
+local pkgVersion = myModuleVersion()
+local pkgNameVer = myModuleFullName()
+
+conflict(pkgName)
+
+load("PrgEnv-intel/8.2.0")
+load("craype")
+load("cray-pals")
+load("git/2.29.0")
+load("intel/19.1.3.304")
+load("python/3.10.4")
+load("ve/evs/1.0")
+
+append_path("PATH", "/lfs/h2/emc/da/noscrub/emc.da/eva/opt/bin")
+append_path("PYTHONPATH", "/lfs/h2/emc/da/noscrub/emc.da/eva/opt/")
+
+whatis("Name: ".. pkgName)
+whatis("Version: ".. pkgVersion)
+whatis("Category: EVA")
+whatis("Description: Load all libraries needed for EVA")
diff --git a/modulefiles/GDAS/wcoss2.intel.lua b/modulefiles/GDAS/wcoss2.intel.lua
index d21099b2e..3986353e7 100644
--- a/modulefiles/GDAS/wcoss2.intel.lua
+++ b/modulefiles/GDAS/wcoss2.intel.lua
@@ -29,6 +29,14 @@ load("eckit/1.24.4")
 load("fckit/0.11.0")
 load("atlas/0.35.0")
 load("nccmp")
+load("nco/5.0.6")
+load("gsl/2.7")
+load("prod_util/2.0.14")
+
+-- Remove HPC_OPT and prepend_patht once prod bufr/12.0.1 is installed
+setenv("HPC_OPT", "/apps/ops/para/libs")
+prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
+load("bufr/12.0.1")
 
 -- 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")
diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt
index 97db7093a..f96a3aec5 100644
--- a/test/soca/gw/CMakeLists.txt
+++ b/test/soca/gw/CMakeLists.txt
@@ -25,6 +25,10 @@ IF (IS_DIRECTORY /scratch2/NCEPDEV/)
   set(PARTITION "hera")
 ENDIF()
 
+IF (IS_DIRECTORY /lfs/h2/)
+   set(MACHINE "wcoss2")
+ENDIF()
+
 # Clean-up
 add_test(NAME test_gdasapp_soca_run_clean
   COMMAND  ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/test/soca/gw/testrun/testjjobs)
diff --git a/ush/soca/run_jjobs.py b/ush/soca/run_jjobs.py
index e7b5fcae3..223ce0cc4 100755
--- a/ush/soca/run_jjobs.py
+++ b/ush/soca/run_jjobs.py
@@ -6,7 +6,7 @@
 import argparse
 from datetime import datetime, timedelta
 
-machines = {"container", "hera", "orion", "hercules"}
+machines = {"container", "hera", "orion", "hercules", "wcoss2"}
 
 # Assume the default conda environement is gdassapp
 ENVS = {'JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY': 'eva'}
@@ -156,7 +156,7 @@ def _conda_envs(self, jjob):
                 self.f.write(f"set +u \n")
                 self.f.write(f"conda activate {ENVS[jjob]} \n")
                 self.f.write(f"set -u \n")
-        elif self.machine == "hera":
+        elif self.machine in ["hera", "wcoss2"]:
             if jjob in ENVS:
                 self.f.write(f"module load {ENVS[jjob].upper()}/{self.machine} \n")