diff --git a/dev/parm/config/gfs/config.ocn.j2 b/dev/parm/config/gfs/config.ocn.j2
index 91eb3c973a..ce01a1a528 100644
--- a/dev/parm/config/gfs/config.ocn.j2
+++ b/dev/parm/config/gfs/config.ocn.j2
@@ -10,6 +10,8 @@ export DO_OCN_PERT_EPBL="NO"  # In MOM_input, this variable determines PERT_EPBL
 # Templated variables in MOM_input_template
 export MOM6_USE_LI2016="True" # set to False for restart reproducibility
 export MOM6_THERMO_SPAN="False"
+export MOM6_WRITE_GEOM=0
+export MOM6_GUST_CONST=0
 
 if [[ "${DO_JEDIOCNVAR}" == "YES" ]]; then
   export ODA_INCUPD="True"
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 7b637a8b7d..163ba47bbb 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 7b637a8b7d8e96c503b1719affaa647dea7b2631
+Subproject commit 163ba47bbb9bff46f8dd81ebddbbc615e11ecb7e