diff --git a/dev/test/nccmp.sh b/dev/test/nccmp.sh
index 70812818d6..6e77cd314f 100755
--- a/dev/test/nccmp.sh
+++ b/dev/test/nccmp.sh
@@ -4,9 +4,11 @@ HOMEgfs=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}")")" && git rev-par
 declare -rx HOMEgfs
 
 source "${HOMEgfs}/dev/ush/load_modules.sh" run
+set +eu
 module load "nccmp/${nccmp_ver:-"1.9.0.1"}"
 
 file1=${1:?}
 file2=${2:?}
 
 nccmp -d -S -f -B --warn=format "${file1}" "${file2}"
+echo $?
diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py
index eaaf4cbb61..2cbbf00968 100644
--- a/dev/workflow/rocoto/gfs_tasks.py
+++ b/dev/workflow/rocoto/gfs_tasks.py
@@ -2217,6 +2217,19 @@ def _arch_tars_deps(self):
                         dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempakgrb2spec'}
                         deps.append(rocoto.add_dependency(dep_dict))
 
+        if self.options['do_awips'] and self.run in ['gfs']:
+
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}_awips_20km_1p0deg'}
+            deps.append(rocoto.add_dependency(dep_dict))
+            dep_dict = {'type': 'task', 'name': f'{self.run}_fbwind'}
+            deps.append(rocoto.add_dependency(dep_dict))
+
+            if self.options['do_wave']:
+                dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsbulls'}
+                deps.append(rocoto.add_dependency(dep_dict))
+                dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsgridded'}
+                deps.append(rocoto.add_dependency(dep_dict))
+
         if self.options['do_metp'] and self.run in ['gfs']:
             deps2 = []
             # taskvalid only handles regular tasks, so just check the first metp job exists
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 6f22f57403..7b637a8b7d 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 6f22f57403db693dee3b6979a4e6f58ade633e86
+Subproject commit 7b637a8b7d8e96c503b1719affaa647dea7b2631
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index 4e93a9f60b..cdfd24c051 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit 4e93a9f60bfdc77f4dd1815fb41ab30303694a67
+Subproject commit cdfd24c051c3545099f3ca7f1fc20f8d2c15349c
diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh
index c860d855b9..64c7e9576d 100755
--- a/ush/parsing_ufs_configure.sh
+++ b/ush/parsing_ufs_configure.sh
@@ -69,6 +69,9 @@ UFS_configure() {
         local MED_history_n=1000000
 
         local histaux_enabled=".false."
+        local MOM6_OUTPUT_DIR="./MOM6_OUTPUT"
+        local MOM6_RESTART_DIR="./MOM6_RESTART"
+        local MOM6_HISTFREQ_N=${FHOUT_OCN:-6}
     fi
 
     if [[ "${cplice}" = ".true." ]]; then