diff --git a/scm/etc/Cheyenne_setup_gnu.csh b/scm/etc/Cheyenne_setup_gnu.csh
index 682bdd49..c37acbdc 100755
--- a/scm/etc/Cheyenne_setup_gnu.csh
+++ b/scm/etc/Cheyenne_setup_gnu.csh
@@ -22,19 +22,19 @@ module purge
 #load the modules in order to compile the CCPP SCM
 echo "Loading gnu and netcdf modules..."
 module load ncarenv/1.3
-module load gnu/10.1.0
-module load mpt/2.22
+module load gnu/11.2.0
+module load mpt/2.25
 module load ncarcompilers/0.5.0
 module load netcdf
 
 echo "Setting up NCEPLIBS"
-module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/modulefiles/stack
 module load hpc/1.2.0
-module load hpc-gnu/10.1.0
-module load hpc-mpt/2.22
-setenv bacio_ROOT /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/bacio/2.4.1
-setenv sp_ROOT /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/sp/2.3.3
-setenv w3emc_ROOT  /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/w3emc/2.9.2
+module load hpc-gnu/11.2.0
+module load hpc-mpt/2.25
+setenv bacio_ROOT /glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/bacio/2.4.1
+setenv sp_ROOT /glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/sp/2.3.3
+setenv w3emc_ROOT /glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 setenv CC gcc
diff --git a/scm/etc/Cheyenne_setup_gnu.sh b/scm/etc/Cheyenne_setup_gnu.sh
index cd02b499..e1a190fc 100755
--- a/scm/etc/Cheyenne_setup_gnu.sh
+++ b/scm/etc/Cheyenne_setup_gnu.sh
@@ -14,19 +14,19 @@ module purge
 #load the modules in order to compile the CCPP SCM
 echo "Loading gnu and netcdf modules..."
 module load ncarenv/1.3
-module load gnu/10.1.0
-module load mpt/2.22
+module load gnu/11.2.0
+module load mpt/2.25
 module load ncarcompilers/0.5.0
 module load netcdf
 
 echo "Setting up NCEPLIBS"
-module use /glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack
+module use /glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/modulefiles/stack
 module load hpc/1.2.0
-module load hpc-gnu/10.1.0
-module load hpc-mpt/2.22
-export bacio_ROOT=/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/bacio/2.4.1
-export sp_ROOT=/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/sp/2.3.3
-export w3emc_ROOT=/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/gnu-10.1.0/w3emc/2.9.2
+module load hpc-gnu/11.2.0
+module load hpc-mpt/2.25
+export bacio_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/bacio/2.4.1
+export sp_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/sp/2.3.3
+export w3emc_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0/gnu-11.2.0/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 export CC=gcc
diff --git a/scm/etc/Cheyenne_setup_intel.csh b/scm/etc/Cheyenne_setup_intel.csh
index 36b12d88..d8bc1789 100755
--- a/scm/etc/Cheyenne_setup_intel.csh
+++ b/scm/etc/Cheyenne_setup_intel.csh
@@ -28,13 +28,13 @@ module load ncarcompilers/0.5.0
 module load netcdf
 
 echo "Setting up NCEPLIBS"
-module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
+module use /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-intel/2022.1
 module load hpc-mpt/2.25
-setenv bacio_ROOT /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/intel-2022.1/bacio/2.4.1
-setenv sp_ROOT /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/intel-2022.1/sp/2.3.3
-setenv w3emc_ROOT /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0/intel-2022.1/w3emc/2.9.2
+setenv bacio_ROOT /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/bacio/2.4.1
+setenv sp_ROOT /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/sp/2.3.3
+setenv w3emc_ROOT /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 setenv CC icc
diff --git a/scm/etc/Cheyenne_setup_intel.sh b/scm/etc/Cheyenne_setup_intel.sh
index 94dc8189..71727e03 100755
--- a/scm/etc/Cheyenne_setup_intel.sh
+++ b/scm/etc/Cheyenne_setup_intel.sh
@@ -20,13 +20,13 @@ module load ncarcompilers/0.5.0
 module load netcdf
 
 echo "Setting up NCEPLIBS"
-module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
+module use /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack
 module load hpc/1.2.0
 module load hpc-intel/2022.1
 module load hpc-mpt/2.25
-export bacio_ROOT=/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/intel-2022.1/bacio/2.4.1
-export sp_ROOT=/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/intel-2022.1/sp/2.3.3
-export w3emc_ROOT=/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0/intel-2022.1/w3emc/2.9.2
+export bacio_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/bacio/2.4.1
+export sp_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/sp/2.3.3
+export w3emc_ROOT=/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/intel-2022.1/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 export CC=icc
diff --git a/scm/etc/Hera_setup_intel.csh b/scm/etc/Hera_setup_intel.csh
index 4aea1004..369f6e3a 100755
--- a/scm/etc/Hera_setup_intel.csh
+++ b/scm/etc/Hera_setup_intel.csh
@@ -17,16 +17,18 @@ setenv SCM_ROOT $MYDIR/../..
 #load the modules in order to compile the CCPP SCM
 echo "Loading intel and netcdf modules..."
 module purge
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
+module load intel/2022.1.2
+module load impi/2022.1.2
+module use /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack
+module load hpc/1.2.0
 module load hpc-intel/2022.1.2
 module load hpc-impi/2022.1.2
 module load netcdf
 
 echo "Setting up NCEPLIBS"
-setenv bacio_ROOT /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/bacio/2.4.1
-setenv sp_ROOT /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/sp/2.3.3
-setenv w3emc_ROOT /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/w3emc/2.9.2
+setenv bacio_ROOT /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/bacio/2.4.1
+setenv sp_ROOT /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/sp/2.3.3
+setenv w3emc_ROOT /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 setenv CC icc
diff --git a/scm/etc/Hera_setup_intel.sh b/scm/etc/Hera_setup_intel.sh
index e09adae2..0bec3364 100755
--- a/scm/etc/Hera_setup_intel.sh
+++ b/scm/etc/Hera_setup_intel.sh
@@ -9,16 +9,18 @@ export SCM_ROOT=$MYDIR/../..
 #load the modules in order to compile the CCPP SCM
 echo "Loading intel and netcdf modules..."
 module purge
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
+module load intel/2022.1.2
+module load impi/2022.1.2
+module use /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack
+module load hpc/1.2.0
 module load hpc-intel/2022.1.2
 module load hpc-impi/2022.1.2
-module load netcdf
+module load netcdfodule load netcdf
 
 echo "Setting up NCEPLIBS"
-export bacio_ROOT=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/bacio/2.4.1
-export sp_ROOT=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/sp/2.3.3
-export w3emc_ROOT=/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-2022.1.2/w3emc/2.9.2
+export bacio_ROOT=/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/bacio/2.4.1
+export sp_ROOT=/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/sp/2.3.3
+export w3emc_ROOT=/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/w3emc/2.9.2
 
 echo "Setting CC/CXX/FC environment variables"
 export CC=icc