diff --git a/.gitmodules b/.gitmodules
index 6e63f4576f..d1945ee9cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,15 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = revert-ccpp-prebuild-call
 [submodule "NEMS"]
   path = NEMS
-  url = https://github.com/NOAA-EMC/NEMS
-  branch = develop
+  #url = https://github.com/NOAA-EMC/NEMS
+  #branch = develop
+  url = https://github.com/climbfuji/NEMS
+  branch = revert-ccpp-prebuild-call
 [submodule "FMS"]
   path = FMS
   url = https://github.com/NOAA-GFDL/FMS
diff --git a/FV3 b/FV3
index b955f81015..187b43e7dc 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit b955f81015b2de589d886e7052feb68485f79466
+Subproject commit 187b43e7dc326e5da5ec7c8aba62dcbf77898f66
diff --git a/NEMS b/NEMS
index 9d05172b71..58d3fe1c9c 160000
--- a/NEMS
+++ b/NEMS
@@ -1 +1 @@
-Subproject commit 9d05172b711f4ab5d6f978dbe575bd67a681b55a
+Subproject commit 58d3fe1c9c22b7fe3cf76f5af1912d16885795e7
diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3
index 588ceaefa9..b70f70a561 100644
--- a/modulefiles/cheyenne.gnu/fv3
+++ b/modulefiles/cheyenne.gnu/fv3
@@ -1,60 +1,47 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Cheyenne/GNU
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on Cheyenne/GNU"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/GNU"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for Cheyenne/GNU"
+module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
+module load cmake/3.16.4
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.gnu
 
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
+# load programming environment
 module load ncarenv/1.3
+# Need to load compilers despite being loaded again below or ncarcompilers will fail
 module load gnu/9.1.0
-module load mpt/2.19
+module load mpt/2.22
 module load ncarcompilers/0.5.0
+module unload netcdf
+
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-20201022/modulefiles/stack
+module load hpc/1.0.0-beta1
+module load hpc-gnu/9.1.0
+module load hpc-mpt/2.22
 
-##
-## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/gnu-9.1.0/mpt-2.19/modules
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+module load jpeg/9.1.0
 
-module load libpng/1.6.35
+module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load esmf/8.1.0bs27
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
 
-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 g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
 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
-
-##
-## SIONlib library
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-9.1.0/mpt-2.19
-module load SIONlib/1.7.4
-
-##
-## load cmake
-##
-module load cmake/3.16.4
-setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpicxx
-setenv CMAKE_Fortran_COMPILER mpif90
-setenv CMAKE_Platform cheyenne.gnu
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
index 71b7ce44f1..31c8f90428 100644
--- a/modulefiles/cheyenne.intel/fv3
+++ b/modulefiles/cheyenne.intel/fv3
@@ -1,60 +1,47 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Cheyenne/Intel
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on Cheyenne/Intel"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/Intel"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for Cheyenne/Intel"
+module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
+module load cmake/3.16.4
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.intel
 
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
+# load programming environment
 module load ncarenv/1.3
+# Need to load compilers despite being loaded again below or ncarcompilers will fail
 module load intel/19.1.1
-module load mpt/2.19
+module load mpt/2.22
 module load ncarcompilers/0.5.0
+module unload netcdf
+
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-20201022/modulefiles/stack
+module load hpc/1.0.0-beta1
+module load hpc-intel/19.1.1
+module load hpc-mpt/2.22
 
-##
-## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/intel-19.1.1/mpt-2.19/modules
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+module load jpeg/9.1.0
 
-module load libpng/1.6.35
+module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load esmf/8.1.0bs27
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
 
-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 g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
 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
-
-##
-## SIONlib library
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/intel-19.1.1/mpt-2.19
-module load SIONlib/1.7.4
-
-##
-## load cmake
-##
-module load cmake/3.16.4
-setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpicxx
-setenv CMAKE_Fortran_COMPILER mpif90
-setenv CMAKE_Platform cheyenne.intel
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1