diff --git a/env/build_hera_intel.env b/env/build_hera_intel.env
index 60353b1e49..876632bcb2 100644
--- a/env/build_hera_intel.env
+++ b/env/build_hera_intel.env
@@ -2,42 +2,44 @@
 
 module purge
 
+module load cmake/3.16.1
+module load hpss
 module use /contrib/sutils/modulefiles
 module load sutils
-module load cmake/3.16.1
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
-
-module load hpc/1.0.0-beta1
+### hpc-stack ###
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+
 module load bacio/2.4.1
 module load crtm/2.3.0
+module load gfsio/1.4.1
 module load g2/3.4.1
-module load g2tmpl/1.9.1
+module load g2tmpl/1.10.0
 module load ip/3.3.3
+module load jasper/2.0.22
 module load nemsio/2.5.2
+module load png/1.6.35
+module load sfcio/1.4.1
+module load sigio/2.3.2
 module load sp/2.3.3
-module load w3emc/2.7.3
+module load wgrib2/2.0.8
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load zlib/1.2.11
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
+### Additional modules ###
+module load esmf/8_1_0_beta_snapshot_27
+module load hdf5/1.10.6
 module load landsfcutil/2.4.1
 module load nemsiogfs/2.5.3
-module load wgrib2/2.0.8
+module load netcdf/4.7.4
+module load upp/10.0.0
+module load w3emc/2.7.3
 
 
 export CMAKE_C_COMPILER=mpiicc
 export CMAKE_CXX_COMPILER=mpiicpc
 export CMAKE_Fortran_COMPILER=mpiifort
 export CMAKE_Platform=hera.intel
-
diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env
index d1f07a496e..33bacbcd12 100644
--- a/env/build_orion_intel.env
+++ b/env/build_orion_intel.env
@@ -1,40 +1,47 @@
 #Setup instructions for MSU Orion using Intel-18.0.5 (bash shell)
 
-module load contrib noaatools
+module purge
 
 module load cmake/3.17.3
+module load contrib noaatools
+module load python/3.7.5
 
-module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
-
-module load hpc/1.0.0-beta1
+### hpc-stack ###
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
 module load bacio/2.4.1
 module load crtm/2.3.0
+module load gfsio/1.4.1
 module load g2/3.4.1
 module load g2tmpl/1.9.1
 module load ip/3.3.3
+module load jasper/2.0.22
 module load nemsio/2.5.2
+module load png/1.6.35
+module load sfcio/1.4.1
+module load sigio/2.3.2
 module load sp/2.3.3
+module load wgrib2/2.0.8
+module load wrf_io/1.1.1
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load zlib/1.2.11
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
+### Additional modules ###
+module load esmf/8_1_0_beta_snapshot_27
+module load hdf5/1.10.6
 module load landsfcutil/2.4.1
 module load nemsiogfs/2.5.3
-module load wgrib2/2.0.8
+module load netcdf/4.7.4
+module load upp/10.0.0
+module load w3emc/2.7.3
+
 
 export CMAKE_C_COMPILER=mpiicc
 export CMAKE_CXX_COMPILER=mpiicpc
 export CMAKE_Fortran_COMPILER=mpiifort
 export CMAKE_Platform=orion.intel
+
diff --git a/env/build_wcoss_cray_intel.env b/env/build_wcoss_cray_intel.env
index f15702e7a1..609c5150d4 100644
--- a/env/build_wcoss_cray_intel.env
+++ b/env/build_wcoss_cray_intel.env
@@ -26,24 +26,24 @@ export PNG_ROOT="/usrx/local/prod//png/1.2.49/intel/sandybridge"
 module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
 module load bacio/2.4.1
 module load crtm/2.3.0
+module load gfsio/1.4.1
 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 sfcio/1.4.1
+module load sigio/2.3.2
 module load sp/2.3.3
+module load upp/10.0.4
 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 landsfcutil/2.4.1
 module load nemsiogfs/2.5.3
 module load wgrib2/2.0.8
 
 module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
 module load esmf/8.1.0bs27
-
+module swap pmi pmi/5.0.11
 
 ## load cmake
 export CMAKE_C_COMPILER=cc
@@ -51,4 +51,3 @@ export CMAKE_CXX_COMPILER=CC
 export CMAKE_Fortran_COMPILER=ftn
 export CMAKE_Platform=wcoss_cray
 
-
diff --git a/env/build_wcoss_dell_p3_intel.env b/env/build_wcoss_dell_p3_intel.env
index 456c9aebd4..705d6263dc 100644
--- a/env/build_wcoss_dell_p3_intel.env
+++ b/env/build_wcoss_dell_p3_intel.env
@@ -2,40 +2,43 @@
 
 module purge
 
+module load cmake/3.16.2
+module load HPSS/5.0.2.5
 module load ips/18.0.1.163
 module load impi/18.0.1
 module load lsf/10.1
 module load python/3.6.3
-module load cmake/3.16.2
-
-module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+### hpc-stack ###
+module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
+
 module load bacio/2.4.1
 module load crtm/2.3.0
+module load gfsio/1.4.1
 module load g2/3.4.1
-module load g2tmpl/1.9.1
+module load g2tmpl/1.10.0
 module load ip/3.3.3
-module load nemsio/2.5.2
+module load jasper/2.0.22
+module load png/1.6.35
+module load sfcio/1.4.1
+module load sigio/2.3.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 zlib/1.2.11
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
+# Additional modules
+module load esmf/8_1_0_beta_snapshot_27
+module load hdf5/1.10.6
 module load landsfcutil/2.4.1
+module load nemsio/2.5.2
 module load nemsiogfs/2.5.3
+module load netcdf/4.7.4
+module load upp/10.0.4
 module load wgrib2/2.0.8
+module load w3emc/2.7.3
 
 
 export CMAKE_C_COMPILER=mpiicc