diff --git a/.gitmodules b/.gitmodules
index fc87e5f3655..51f510f4db3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "sorc/ufs_model.fd"]
   path = sorc/ufs_model.fd
-  url = https://github.com/ufs-community/ufs-weather-model
+  url = https://github.com/dpsarmie/ufs-weather-model
   ignore = dirty
 [submodule "sorc/wxflow"]
   path = sorc/wxflow
diff --git a/dev/parm/config/gfs/config.ufs b/dev/parm/config/gfs/config.ufs
index 411b0461b46..986e89ac629 100644
--- a/dev/parm/config/gfs/config.ufs
+++ b/dev/parm/config/gfs/config.ufs
@@ -359,6 +359,8 @@ case ${fv3_res} in
   "C48" | "C96" | "C192")
     zstandard_level=0
     ideflate=0
+    zstandard_level_rst=0
+    ideflate_rst=0
     quantize_nsd=0
     OUTPUT_FILETYPE_ATM="netcdf"
     OUTPUT_FILETYPE_SFC="netcdf"
@@ -366,6 +368,8 @@ case ${fv3_res} in
   "C384" | "C768" | "C1152" | "C3072")
     zstandard_level=0
     ideflate=1
+    zstandard_level_rst=0
+    ideflate_rst=0
     quantize_nsd=14
     OUTPUT_FILETYPE_ATM="netcdf_parallel"
     if [[ "${fv3_res}" == "C384" ]]; then
@@ -379,7 +383,7 @@ case ${fv3_res} in
     exit 15
     ;;
 esac
-export zstandard_level ideflate quantize_nsd
+export zstandard_level ideflate quantize_nsd zstandard_level_rst ideflate_rst
 export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC
 
 # cpl defaults
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 7577e57ed81..aca089fd741 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 7577e57ed812b82762813b04431608c5a7ea5899
+Subproject commit aca089fd741851141a371e5029509d6622d5c010
diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh
index a5f141cd253..6009bac14a6 100755
--- a/ush/parsing_model_configure_FV3.sh
+++ b/ush/parsing_model_configure_FV3.sh
@@ -45,6 +45,8 @@ FV3_model_configure() {
     local OUTPUT_FILE="'${OUTPUT_FILETYPE_ATM}' '${OUTPUT_FILETYPE_SFC}'"
     local ZSTANDARD_LEVEL=${zstandard_level:-0}
     local IDEFLATE=${ideflate:-0}         # netCDF zlib lossless compression (0-9); 0: no compression
+    local ZSTANDARD_LEVEL_RST=${zstandard_level_rst:-0} # For restart files
+    local IDEFLATE_RST=${ideflate_rst:-0} # Restart files: netCDF zlib lossless compression (0-9); 0: none
     local QUANTIZE_NSD=${quantize_nsd:-0} # netCDF compression
     local ICHUNK2D=$((4 * restile))
     local JCHUNK2D=$((2 * restile))
diff --git a/ush/parsing_namelists_MOM6.sh b/ush/parsing_namelists_MOM6.sh
index b8c7293681c..5478c07a624 100755
--- a/ush/parsing_namelists_MOM6.sh
+++ b/ush/parsing_namelists_MOM6.sh
@@ -60,6 +60,7 @@ MOM6_namelists() {
         local PERT_EPBL="False"
     fi
     local MOM6_HFREEZE=20.0
+    local MOM6_WRITE_GEOM=0
     # Ensure the template exists
     local template=${MOM6_INPUT_TEMPLATE:-"${PARMgfs}/ufs/MOM_input_${OCNRES}.IN"}
     if [[ ! -f "${template}" ]]; then