diff --git a/dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml b/dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml
index 97d0749117b..f4924de0895 100644
--- a/dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml
+++ b/dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml
@@ -22,6 +22,7 @@ base:
   SDATE_GFS: 2024111512
   FHMAX_GFS: 384
   FHMAX_HF_GFS: 120
+  CASE_HIST: "C768"
 
 prepoceanobs:
   use_exp_obs: "YES"
diff --git a/dev/parm/config/gfs/config.resources b/dev/parm/config/gfs/config.resources
index 3b378af0d18..d42ea8ca632 100644
--- a/dev/parm/config/gfs/config.resources
+++ b/dev/parm/config/gfs/config.resources
@@ -513,7 +513,7 @@ case ${step} in
     ;;
 
   "marinebmatinit")
-    walltime="00:10:00"
+    walltime="00:20:00"
     ntasks=1
     threads_per_task=1
     tasks_per_node=${max_tasks_per_node}
@@ -869,7 +869,7 @@ case ${step} in
     MEDPETS=${MEDPETS:-${FV3PETS}}
     (( MEDPETS = FV3PETS ))
     (( MEDTHREADS = FV3THREADS )) 
-    (( "${MEDPETS}" > 24000 )) && MEDPETS=1200
+    (( "${MEDPETS}" > 4800 )) && MEDPETS=4800
     export MEDPETS MEDTHREADS
     echo "MEDIATOR using (threads, PETS) = (${MEDTHREADS}, ${MEDPETS})"
 
@@ -1327,7 +1327,7 @@ case ${step} in
   "epos")
     walltime="00:15:00"
     if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
-        walltime="00:25:00"
+        walltime="00:35:00"
     fi
     ntasks=80
     threads_per_task=1
diff --git a/dev/parm/config/gfs/config.wave b/dev/parm/config/gfs/config.wave
index 681bcae9057..c459864283f 100644
--- a/dev/parm/config/gfs/config.wave
+++ b/dev/parm/config/gfs/config.wave
@@ -89,7 +89,7 @@ export DTPNT_WAV=3600
 export FHINCP_WAV=$(( DTPNT_WAV / 3600 ))
 
 # Selected output parameters (gridded)
-export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
+export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR"
 
 # Restart file config
 if [[ "${RUN}" == "gdas" ]]; then
diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
index 5e3a9259277..d2e5b36d902 160000
--- a/sorc/ufs_model.fd
+++ b/sorc/ufs_model.fd
@@ -1 +1 @@
-Subproject commit 5e3a9259277fc6272f4b3078353aebc84f070d3b
+Subproject commit d2e5b36d902603f20e4d6697e200a9b0c87d4396
diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index 6886911fd85..fa1becdd3da 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -296,6 +296,7 @@ local CPLWAV2ATM=${cplwav2atm:-".false."}
 local USE_MED_FLUX=${use_med_flux:-".false."}
 local CPLLND=${cpllnd:-".false."}
 local CPLLND2ATM=${cpllnd2atm:-".false."}
+local USE_OCEANUV=${use_oceanuv:-".false."}
 
 # CPL CHM options
 if [[ ${cplchm} = ".true." ]]; then