diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
index a157b7369c..d61433a40f 100644
--- a/modulefiles/ufs_cheyenne.gnu
+++ b/modulefiles/ufs_cheyenne.gnu
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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
diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
index 9c015b390a..8b8af506b6 100644
--- a/modulefiles/ufs_cheyenne.gnu_debug
+++ b/modulefiles/ufs_cheyenne.gnu_debug
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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
diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
index 0a3b75144e..1eae6e2f7b 100644
--- a/modulefiles/ufs_cheyenne.intel
+++ b/modulefiles/ufs_cheyenne.intel
@@ -11,16 +11,16 @@ module load python/3.7.9
 
 # load programming environment
 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 unload netcdf
 
-module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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-mpt/2.25
 
 module load ufs_common
 
diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
index 98a6febd75..4564060569 100644
--- a/modulefiles/ufs_cheyenne.intel_debug
+++ b/modulefiles/ufs_cheyenne.intel_debug
@@ -11,15 +11,16 @@ module load python/3.7.9
 
 # load programming environment
 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 unload netcdf
 
-module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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 ufs_common_debug