diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu
index f8be4be1ea..1f4d24abba 100644
--- a/modulefiles/build_cheyenne_gnu
+++ b/modulefiles/build_cheyenne_gnu
@@ -8,11 +8,11 @@ proc ModulesHelp { } {
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
 module load cmake/3.22.0
+module load python/3.7.9
 module load ncarenv/1.3
 module load gnu/11.2.0
 module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load python/3.7.9
 module unload netcdf
 
 module use /glade/work/epicufsrt/GMTB/tools/gnu/11.2.0/hpc-stack-v1.2.0/modulefiles/stack
diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel
index c1d868d458..997678744a 100644
--- a/modulefiles/build_cheyenne_intel
+++ b/modulefiles/build_cheyenne_intel
@@ -7,11 +7,13 @@ proc ModulesHelp { } {
 
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
-module purge
 module load cmake/3.22.0
+module load python/3.7.9
+module load ncarenv/1.3
 module load intel/2022.1
 module load mpt/2.25
-module load python/3.7.9
+module load ncarcompilers/0.5.0
+module unload netcdf
 
 module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
@@ -19,15 +21,16 @@ module load hpc-intel/2022.1
 module load hpc-mpt/2.25
 
 module load srw_common
+
 module load g2/3.4.5
 module load esmf/8.3.0b09
 module load mapl/2.11.0-esmf-8.3.0b09
 module load netcdf/4.7.4
 module load libpng/1.6.37
 module load pio/2.5.3
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpixx
+setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform cheyenne.intel
-