diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu
index add5ee3b0f..bbd0008203 100644
--- a/modulefiles/build_cheyenne_gnu
+++ b/modulefiles/build_cheyenne_gnu
@@ -15,17 +15,18 @@ module load ncarcompilers/0.5.0
 module load python/3.7.9
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-gnu/10.1.0
 module load hpc-mpt/2.22
 
 module load srw_common
-module load g2/3.4.3
-module load esmf/8_2_0
+module load g2/3.4.5
+module load esmf/8.3.0b09
 module load netcdf/4.7.4
-module load png/1.6.35
+module load libpng/1.6.37
 module load pio/2.5.2
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
 setenv CMAKE_CXX_COMPILER mpicxx
diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel
index b83c36a5df..98e54b90fe 100644
--- a/modulefiles/build_cheyenne_intel
+++ b/modulefiles/build_cheyenne_intel
@@ -9,23 +9,24 @@ module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
 module load cmake/3.22.0
 module load ncarenv/1.3
-module load intel/2021.2
-module load mpt/2.22
+module load intel/2022.1
+module load mpt/2.25
 module load ncarcompilers/0.5.0
 module load python/3.7.9
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
-module load hpc-intel/2021.2
-module load hpc-mpt/2.22
+module load hpc-intel/2022.1
+module load hpc-mpt/2.25
 
 module load srw_common
-module load g2/3.4.3
-module load esmf/8_2_0
+module load g2/3.4.5
+module load esmf/8.3.0b09
 module load netcdf/4.7.4
-module load png/1.6.35
+module load libpng/1.6.37
 module load pio/2.5.2
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
 setenv CMAKE_CXX_COMPILER mpicxx
diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index c8c87f92a8..b523fc2d30 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -2,18 +2,18 @@
 
 module load jasper/2.0.25
 module load zlib/1.2.11
-module load-any png/1.6.35 libpng/1.6.35
+module load-any libpng/1.6.37 png/1.6.35
 
 module load hdf5/1.10.6
 module load-any netcdf/4.7.4 netcdf-c/4.7.4
 module load-any netcdf/4.7.4 netcdf-fortran/4.5.4
 module load-any pio/2.5.2 parallelio/2.5.2
-module load-any esmf/8_2_0 esmf/8.2.0
-module load fms/2021.03
+module load-any esmf/8.3.0b09 esmf/8_2_0 esmf/8.2.0
+module load-any fms/2022.01 fms/2021.03
 
 module load bacio/2.4.1
 module load crtm/2.3.0
-module load g2/3.4.3
+module load g2/3.4.5
 module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
@@ -22,13 +22,14 @@ module load upp/10.0.10
 
 module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3
 module load-any yafyaml/v0.5.1 yafyaml/0.5.1
-module load-any mapl/2.11.0-esmf-8_2_0 mapl/2.11.0-esmf-8.2.0
+module load-any mapl/2.11.0-esmf-8.3.0b09 mapl/2.11.0-esmf-8_2_0 mapl/2.11.0-esmf-8.2.0
 
 module load gfsio/1.4.1
 module load landsfcutil/2.4.1
-module load nemsio/2.5.2
+module load nemsio/2.5.4
 module load nemsiogfs/2.5.3
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module load w3emc/2.7.3
+module load w3emc/2.9.2
 module load wgrib2/2.0.8
+module load wrf_io/1.2.0