diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
index 8c14ac4cbd..a157b7369c 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/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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 05f7da715a..9c015b390a 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/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/GMTB/tools/hpc-stack-v1.2.0_6eb6/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 32e2a89350..0a3b75144e 100644
--- a/modulefiles/ufs_cheyenne.intel
+++ b/modulefiles/ufs_cheyenne.intel
@@ -16,7 +16,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 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/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
diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
index d6efb4c51e..98a6febd75 100644
--- a/modulefiles/ufs_cheyenne.intel_debug
+++ b/modulefiles/ufs_cheyenne.intel_debug
@@ -16,7 +16,7 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 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/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
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
index 3868577dc5..ee8569c079 100644
--- a/modulefiles/ufs_common
+++ b/modulefiles/ufs_common
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8.2.1b04
+module load esmf/8.3.0b09
 module load fms/2021.04
 
 module load bacio/2.4.1
@@ -20,4 +20,4 @@ module load w3nco/2.4.1
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
-module load mapl/2.11.0-esmf-8.2.1b04
+module load mapl/2.11.0-esmf-8.3.0b09
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
index 8e4175c2b0..2898f0ec72 100644
--- a/modulefiles/ufs_common_debug
+++ b/modulefiles/ufs_common_debug
@@ -7,7 +7,7 @@ module load png/1.6.35
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
-module load esmf/8.2.1b04-debug
+module load esmf/8.3.0b09-debug
 module load fms/2021.04
 
 module load bacio/2.4.1
@@ -20,4 +20,4 @@ module load w3nco/2.4.1
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
-module load mapl/2.11.0-esmf-8.2.1b04
+module load mapl/2.11.0-esmf-8.3.0b09
diff --git a/tests/rt.sh b/tests/rt.sh
index a8a0415fd6..161b7ac7f9 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -355,7 +355,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   COMPILE_QUEUE=regular
   PARTITION=
   dprefix=/glade/scratch
-  DISKNM=/glade/p/ral/jntp/GMTB/ufs-weather-model/RT
+  DISKNM=/glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=pbs