diff --git a/ci/cases/yamls/gefs_replay_ci.yaml b/ci/cases/yamls/gefs_replay_ci.yaml
index 6f9037d9eef..6c5b06700f4 100644
--- a/ci/cases/yamls/gefs_replay_ci.yaml
+++ b/ci/cases/yamls/gefs_replay_ci.yaml
@@ -3,5 +3,11 @@ defaults:
 base:
   REPLAY_ICS: "YES"
   FCST_BREAKPOINTS: ""
+  FHMAX_GFS: 48
+  FHMAX_HF_GFS: 24
+  DO_EXTRACTVARS: "YES"
+  FHOUT_HF_GFS: 3
+  FHOUT_OCN_GFS: 24
+  FHOUT_ICE_GFS: 24
   BASE_CPLIC: {{ 'TOPICDIR' | getenv }}/REPLAY_ICs/CI
 
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
index d4996e10119..0989a398746 100644
--- a/parm/config/gefs/config.base
+++ b/parm/config/gefs/config.base
@@ -245,9 +245,9 @@ export FCST_SEGMENTS="${FHMIN_GFS},${breakpnts:+${breakpnts},}${FHMAX_GFS}"
 
 export FHOUT_GFS=6
 export FHMAX_HF_GFS=@FHMAX_HF_GFS@
-export FHOUT_HF_GFS=1
-export FHOUT_OCN_GFS=6
-export FHOUT_ICE_GFS=6
+export FHOUT_HF_GFS=@FHOUT_HF_GFS@
+export FHOUT_OCN_GFS=@FHOUT_OCN_GFS@
+export FHOUT_ICE_GFS=@FHOUT_ICE_GFS@
 export FHMIN_WAV=${OFFSET_START_HOUR:-0}
 export FHOUT_WAV=3
 export FHMAX_HF_WAV=120
diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml
index e4666d1aba3..e17026d3a61 100644
--- a/parm/config/gefs/yaml/defaults.yaml
+++ b/parm/config/gefs/yaml/defaults.yaml
@@ -11,6 +11,9 @@ base:
   DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 120
   FHMAX_HF_GFS: 0
+  FHOUT_HF_GFS: 1
   FCST_BREAKPOINTS: "48"
   REPLAY_ICS: "NO"
   USE_OCN_PERTURB_FILES: "false"
+  FHOUT_OCN_GFS: 6
+  FHOUT_ICE_GFS: 6
diff --git a/parm/product/gefs.0p25.fFFF.paramlist.a.txt b/parm/product/gefs.0p25.fFFF.paramlist.a.txt
index a4a3ace3855..a9775aca6b6 100644
--- a/parm/product/gefs.0p25.fFFF.paramlist.a.txt
+++ b/parm/product/gefs.0p25.fFFF.paramlist.a.txt
@@ -18,7 +18,7 @@
 :CIN:180-0 mb above ground:
 :CIN:surface:
 :HLCY:3000-0 m above ground:
-:TCDC:entire atmosphere:
+:TCDC:entire atmosphere (considered as a single layer):
 :WEASD:surface:
 :SNOD:surface:
 :ULWRF:top of atmosphere:
diff --git a/parm/product/gefs.0p25.fFFF.paramlist.b.txt b/parm/product/gefs.0p25.fFFF.paramlist.b.txt
index f7fdb73ddf3..2da9187fabd 100644
--- a/parm/product/gefs.0p25.fFFF.paramlist.b.txt
+++ b/parm/product/gefs.0p25.fFFF.paramlist.b.txt
@@ -65,6 +65,7 @@
 :CWORK:entire atmosphere (considered as a single layer):
 :DPT:30-0 mb above ground:
 :DUVB:surface:
+:FDNSSTMP:surface:
 :FLDCP:surface:
 :FRICV:surface:
 :GFLUX:surface:
@@ -346,6 +347,7 @@
 :TMP:surface:
 :TMP:tropopause:
 :TOZNE:entire atmosphere (considered as a single layer):
+:TSNOWP:surface:
 :TSOIL:0.1-0.4 m below ground:
 :TSOIL:0.4-1 m below ground:
 :TSOIL:1-2 m below ground:
diff --git a/ush/extractvars_tools.sh b/ush/extractvars_tools.sh
index daf61a3d2e4..de5a014ebe5 100644
--- a/ush/extractvars_tools.sh
+++ b/ush/extractvars_tools.sh
@@ -17,7 +17,7 @@ check_atmos() {
   done
   mapfile -t requestedvar_in_allgrb2file_arr < "${requestedvar_in_allgrb2file}"
   while read -r vari; do
-    if [[ ! ${requestedvar_in_allgrb2file_arr[*]} =~ ${vari} ]] ;then
+    if [[ ! ${requestedvar_in_allgrb2file_arr[*]} =~ "${vari}" ]] ;then
       echo "WARNING: PARM VARIABLE (${vari}) is not available in pgrb and pgrb2b for f${fnhl}."
     fi
   done <"${varlistl}"
diff --git a/ush/ocnice_extractvars.sh b/ush/ocnice_extractvars.sh
index 51276172b91..43e69ebe9ba 100755
--- a/ush/ocnice_extractvars.sh
+++ b/ush/ocnice_extractvars.sh
@@ -25,11 +25,19 @@ for (( nh = FHMIN_GFS; nh <= FHMAX_GFS; nh = nh + fhout_ocnice )); do
   fnh=$(printf "%3.3d" "${nh}")
 
   if [[ ${component_name} == "ocn" ]]; then
-    infile=${COMIN_OCEAN_NETCDF}/${datares}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc
+    if [[ "${datares}" == "native" ]]; then
+      infile=${COMIN_OCEAN_HISTORY}/${RUN}.ocean.t${cyc}z.${fhout_ocnice}hr_avg.f${fnh}.nc
+    else
+      infile=${COMIN_OCEAN_NETCDF}/${datares}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc
+    fi
     # For ocean products, add an argument to extract a subset of levels
     otherargs=(-d "${depthvar_name},""${zmin},""${zmax}")
   elif [[ ${component_name} == "ice" ]]; then
-    infile=${COMIN_ICE_NETCDF}/${datares}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc
+    if [[ "${datares}" == "native" ]]; then
+      infile=${COMIN_ICE_HISTORY}/${RUN}.ice.t${cyc}z.${fhout_ocnice}hr_avg.f${fnh}.nc
+    else
+      infile=${COMIN_ICE_NETCDF}/${datares}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc
+    fi
     otherargs=()
   fi
   outfile=${subdata}/${RUN}.${component_name}.t${cyc}z.${datares}.f${fnh}.nc