diff --git a/README.md b/README.md
index 20453c6eaa..d6288524bb 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,10 @@ E.g. use of `build.sh` to build the coupled model with `FV3_GFS_v15p2` as the CC
 ```
 $> CMAKE_FLAGS="-DS2S=ON" CCPP_SUITES="FV3_GFS_v15p2" ./build.sh
 ```
+The build system is regularly tested with [Tier-1 and Tier-2 platforms](
+https://github.com/ufs-community/ufs-weather-model/wiki/Regression-Test-Policy-for-Weather-Model-Platforms-and-Compilers).
+Configurations for other platforms that are available with UFS should be used with the understanding that they are not regularly
+tested and users will have to adapt those to make it work.
 
 # Disclaimer
 
diff --git a/modulefiles/stampede.intel/fv3 b/modulefiles/stampede.intel/fv3
index 76b7500cbc..b1ca38a351 100644
--- a/modulefiles/stampede.intel/fv3
+++ b/modulefiles/stampede.intel/fv3
@@ -12,38 +12,37 @@ module-whatis "loads NEMS FV3 prerequisites for Stampede/Intel"
 # handled by the module-setup.sh (or .csh) script.
 
 ##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
+## NCEP libraries
 ##
-module load intel/18.0.2
-module load impi/18.0.2
+module use /work/08048/hanglei/NCEP/install/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+module load hpc-intel/18.0.2
+module load hpc-impi/18.0.2
 module load python3/3.7.0
 
-##
-## use pre-compiled ESMF and NCEP libraries for above compiler / MPI combination
-##
-# DH* todo - shared directory
-module use -a /work/06146/tg854455/stampede2/ufs-stack-20200909/intel-18.0.2/impi-18.0.2/modules
-# *DH
-
-module load libpng/1.6.35
-module load netcdf/4.7.4
-module load esmf/8.1.0bs27
-
-module load bacio/2.4.0
+module load bacio/2.4.1
 module load crtm/2.3.0
-module load g2/3.4.0
-module load g2tmpl/1.9.0
-module load ip/3.3.0
-module load nceppost/dceca26
-module load nemsio/2.5.1
-module load sp/2.3.0
-module load w3emc/2.7.0
-module load w3nco/2.4.0
-
-module load gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.0
+
+module load gfsio/1.4.1
+module load sfcio/1.4.1
+module load sigio/2.3.2
+
+module load jasper/2.0.25
+module load png/1.6.35
+module load zlib/1.2.11
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.2
+module load esmf/8_1_0_beta_snapshot_27
 
 ##
 ## load cmake
diff --git a/tests/fv3_conf/fv3_slurm.IN_stampede b/tests/fv3_conf/fv3_slurm.IN_stampede
index 59fe5a87f7..4953a98fc7 100644
--- a/tests/fv3_conf/fv3_slurm.IN_stampede
+++ b/tests/fv3_conf/fv3_slurm.IN_stampede
@@ -1,9 +1,9 @@
 #!/bin/bash -l
 #SBATCH -o out
 #SBATCH -e err
-#SBATCH -N 4
+#SBATCH -N @[NODES]
 #SBATCH -A @[ACCNR]
-#SBATCH -p skx-dev
+#SBATCH -p @[QUEUE]
 #SBATCH -n @[TASKS]
 #SBATCH -t 00:@[WLCLK]:00
 
diff --git a/tests/rt.sh b/tests/rt.sh
index 90a0532faf..5ef9ffb16a 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -327,11 +327,12 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
 
   export PYTHONPATH=
   ECFLOW_START=
-  QUEUE=skx-dev
+  QUEUE=skx-normal
   COMPILE_QUEUE=skx-dev
   PARTITION=
-  dprefix=$WORK/ufs-weather-model/run
-  DISKNM=$WORK/ufs-weather-model/RT
+  ACCNR=TG-EES200015
+  dprefix=$SCRATCH/ufs-weather-model/run
+  DISKNM=/work/07736/minsukji/stampede2/ufs-weather-model/RT
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=slurm