diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index 2668ca58..bd74aa65 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -8,7 +8,7 @@ defaults:
     shell: bash -leo pipefail {0}
 
 env:
-  cache_key: gcc1  # The number (#) following the cache_key "gcc" is to flush Action cache.
+  cache_key: gcc2  # The number (#) following the cache_key "gcc" is to flush Action cache.
   CC: gcc-10
   FC: gfortran-10
   CXX: g++-10
diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
index 21ee9b2e..c19a5ab0 100644
--- a/.github/workflows/intel.yml
+++ b/.github/workflows/intel.yml
@@ -9,7 +9,7 @@ defaults:
 
 # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
 env:
-  cache_key: intel2  # The number (#) following the cache_key "intel" is to flush Action cache.
+  cache_key: intel3  # The number (#) following the cache_key "intel" is to flush Action cache.
   CC: icc
   FC: ifort
   CXX: icpc
diff --git a/ci/spack.yaml b/ci/spack.yaml
index d8f53c72..ac741f0a 100644
--- a/ci/spack.yaml
+++ b/ci/spack.yaml
@@ -6,6 +6,7 @@ spack:
   specs:
   - netcdf-c@4.7.4
   - netcdf-fortran@4.5.3
+  - bacio@2.4.1
   - w3emc@2.9.2
   - gsi-ncdiag@1.0.0
   view: true
diff --git a/modulefiles/common.lua b/modulefiles/common.lua
index b26b2344..b9f97daa 100644
--- a/modulefiles/common.lua
+++ b/modulefiles/common.lua
@@ -3,9 +3,11 @@ Load common modules to build GSI Monitoring on all machines
 ]])
 
 local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1"
+local bacio=os.getenv("bacio_ver") or "2.4.1"
+local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0"
 
 load(pathJoin("netcdf", netcdf_ver))
+load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("ncdiag", ncdiag_ver))
diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua
index e10d9125..907520ec 100644
--- a/modulefiles/jet.lua
+++ b/modulefiles/jet.lua
@@ -1,14 +1,17 @@
 help([[
 ]])
 
-load("cmake/3.20.1")
-
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
 prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
 
-load("hpc/1.1.0")
-load("hpc-intel/18.0.5.274")
+local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
+local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274"
+local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+
+load(pathJoin("hpc", hpc_ver))
+load(pathJoin("hpc-intel", hpc_intel_ver))
+load(pathJoin("hpc-impi", hpc_impi_ver))
+load(pathJoin("cmake", cmake_ver))
 
 load("common")
 
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index 0eae636c..ecd1ad53 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -2,16 +2,6 @@
 
 case $(hostname -f) in
 
-  llogin[1-3]) MACHINE_ID=wcoss_cray ;; ### luna
-  slogin[1-3]) MACHINE_ID=wcoss_cray ;; ### surge
-
-  m7[12]a[1-3].ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### mars
-  v7[12]a[1-3].ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus
-  m109a[1-4].ncep.noaa.gov)   MACHINE_ID=wcoss_dell_p3 ;; ### mars3.5
-  m110a[1-4].ncep.noaa.gov)   MACHINE_ID=wcoss_dell_p3 ;; ### mars3.5
-  v109a[1-4].ncep.noaa.gov)   MACHINE_ID=wcoss_dell_p3 ;; ### venus3.5
-  v110a[1-4].ncep.noaa.gov)   MACHINE_ID=wcoss_dell_p3 ;; ### venus3.5
-
   adecflow0[12].acorn.wcoss2.ncep.noaa.gov)  MACHINE_ID=wcoss2 ;; ### acorn
   alogin0[12].acorn.wcoss2.ncep.noaa.gov)    MACHINE_ID=wcoss2 ;; ### acorn
   clogin0[1-9].cactus.wcoss2.ncep.noaa.gov)  MACHINE_ID=wcoss2 ;; ### cactus01-9
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 67821de8..469fd4a3 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -29,30 +29,6 @@ elif [[ $MACHINE_ID = s4* ]] ; then
     fi
     module purge
 
-elif [[ $MACHINE_ID = wcoss_cray ]] ; then
-    # We are on NOAA Luna or Surge
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /opt/modules/default/init/bash
-    fi
-    module purge
-    # Workaround until module issues are fixed:
-    unset _LMFILES_
-    unset LOADEDMODULES
-    module use /opt/modulefiles
-    module use /opt/cray/ari/modulefiles
-    module use /opt/cray/craype/default/alt-modulefiles
-    module use /opt/cray/alt-modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/modulefiles
-    module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-    module use /usrx/local/prod/modulefiles
-
-elif [[ $MACHINE_ID = wcoss_dell_p3 ]] ; then
-    # We are on NOAA Mars or Venus
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /usrx/local/prod/lmod/lmod/init/bash
-    fi
-    module purge
-
 elif [[ $MACHINE_ID = wcoss2 ]]; then
     # We are on WCOSS2
     module reset