diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh
index 7e84eaebc2..d2c8e31cf9 100755
--- a/sorc/build_ufs.sh
+++ b/sorc/build_ufs.sh
@@ -5,7 +5,8 @@ cwd=$(pwd)
 
 # Default settings
 APP="S2SWA"
-CCPP_SUITES="FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v17_coupled_p8_ugwpv1,FV3_global_nest_v1"  # TODO: does the g-w need to build with all these CCPP_SUITES?
+CCPP_SUITES="FV3_GFS_v17_p8_ugwpv1_c3_mynn,FV3_GFS_v17_p8_ugwpv1_mynn"  # TODO: does the g-w need to build with all these CCPP_SUITES?
+#CCPP_SUITES="FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v17_coupled_p8_ugwpv1,FV3_global_nest_v1"  # TODO: does the g-w need to build with all these CCPP_SUITES?
 PDLIB="ON"
 
 while getopts ":da:fj:vw" option; do
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 831a51fef8..67e54ac36e 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 831a51fef8fca7526ce09eb2f78f0f75631b5f0b
+Subproject commit 67e54ac36edc8b0e6991e0fecf7e6e8a255f41d2