diff --git a/.gitmodules b/.gitmodules
index 0c3b70cc3f..ea5ef447f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/XuLi-NOAA/fv3atm
+  branch = feature/ufs-nst
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
diff --git a/FMS b/FMS
index d4724fa36e..0707f2c027 160000
--- a/FMS
+++ b/FMS
@@ -1 +1 @@
-Subproject commit d4724fa36ead10bfd818b7e3092a4824eff7f323
+Subproject commit 0707f2c0279a9efd12cdbf0133c1e09435766928
diff --git a/FV3 b/FV3
index 07b00a9a84..649ae20365 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 07b00a9a84782aa95a18cc8a9c91ba31a76ea619
+Subproject commit 649ae20365b81f7b586a0aee162340374738af19
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index 3703ca7ddc..a729a7fb40 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit 3703ca7ddc3dbd18d205581d32e47aa828fed976
+Subproject commit a729a7fb400d8d441868606abdb3e722ceb2b8f5
diff --git a/WW3 b/WW3
index fc509248a1..a89e2a6339 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit fc509248a1cd397e138e65d57c1b10183fc64e2f
+Subproject commit a89e2a6339a016522d3a84188756d0a4bb11be87
diff --git a/stochastic_physics b/stochastic_physics
index d0e62eb299..c39bb8a09a 160000
--- a/stochastic_physics
+++ b/stochastic_physics
@@ -1 +1 @@
-Subproject commit d0e62eb2996b363862fd543fe9ec910bd75bf004
+Subproject commit c39bb8a09a196a9dd17ea3fb52152b61ef2881ae
diff --git a/tests/rt.conf b/tests/rt.conf
index 3a39fd4416..4f66a478af 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -133,11 +133,12 @@ RUN     | fv3_gfs_v16_ras_debug
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled             | - wcoss_cray jet.intel                  | fv3 |
-RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
-RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel                  |     | cpld_control
-RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel                  | fv3 |
-RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray jet.intel                  |     | cpld_controlfrac
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled FV3_GFS_v15p2_couplednsst                  | - wcoss_cray jet.intel       | fv3 |
+RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel       | fv3 |
+RUN     | cpld_control_nsst                                                                                                       | - wcoss_cray jet.intel       | fv3 |
+RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel       |     | cpld_control
+RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel       | fv3 |
+RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray jet.intel       |     | cpld_controlfrac
 
 RUN     | cpld_2threads                                                                                                           | - wcoss_cray jet.intel                  |     |
 RUN     | cpld_decomp                                                                                                             | - wcoss_cray jet.intel                  |     |
diff --git a/tests/rt.sh b/tests/rt.sh
index fa245cf8fe..af95bd4fa8 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -138,7 +138,7 @@ if [[ $MACHINE_ID = wcoss_cray ]]; then
   QUEUE=debug
   COMPILE_QUEUE=dev
   PARTITION=
-  ACCNR=GFS-DEV
+  ACCNR=DA-DEV
   if [[ -d /gpfs/hps3/ptmp ]] ; then
       STMP=/gpfs/hps3/stmp
       PTMP=/gpfs/hps3/stmp
@@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   QUEUE=batch
   COMPILE_QUEUE=batch
 
-  #ACCNR=fv3-cpu
+  ACCNR=da-cpu
   PARTITION=
   dprefix=/scratch1/NCEPDEV
   DISKNM=$dprefix/nems/emc.nemspara/RT