diff --git a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml
new file mode 100644
index 00000000000..df0574ddc73
--- /dev/null
+++ b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml
@@ -0,0 +1,23 @@
+experiment:
+  system: gfs
+  mode: cycled
+
+arguments:
+  account: {{ 'HPC_ACCOUNT' | getenv }}
+  pslot: {{ 'pslot' | getenv }}
+  app: S2SW
+  resdetatmos: 96
+  resensatmos: 48
+  resdetocean: 5.0
+  comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
+  expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  idate: 2021122012
+  edate: 2021122100
+  nens: 2
+  interval: 6
+  start: cold
+  yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
+
+skip_ci_on_hosts:
+  - gaeac5
diff --git a/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
new file mode 100644
index 00000000000..e35850ed178
--- /dev/null
+++ b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
@@ -0,0 +1,28 @@
+defaults:
+  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+base:
+  DOIAU: "YES"
+  DO_JEDIATMVAR: "NO"
+  DO_JEDIATMENS: "NO"
+  DO_JEDIOCNVAR: "YES"
+  DO_JEDISNOWDA: "YES"
+  DO_GSISOILDA: "YES"
+  DO_MERGENSST: "NO"
+  DOHYBVAR: "YES"
+  DOHYBVAR_OCN: "YES"
+  DOLETKF_OCN: "NO"
+  DO_STARTMEM_FROM_JEDIICE: "YES"
+  DO_FIT2OBS: "YES"
+  DO_VERFOZN: "YES"
+  DO_VERFRAD: "YES"
+  EUPD_CYC: "both"
+  INTERVAL_GFS: 6
+  SDATE_GFS: 2021122018
+  NMEM_ENS_GFS: 2 
+  NMEM_ENS_GFS_OFFSET: 0 
+  DO_TEST_MODE: "NO"
+
+marineanl:
+  SOCA_NINNER: 1
+
+  
diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py
index 89ac5e6e8de..3b0a99dfd32 100644
--- a/dev/workflow/rocoto/gfs_tasks.py
+++ b/dev/workflow/rocoto/gfs_tasks.py
@@ -1938,7 +1938,10 @@ def metp(self):
                     dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': offset}
                     deps2.append(rocoto.add_dependency(dep_dict))
 
-                offset = timedelta_to_HMS(-to_timedelta(f'{6*lookback}H'))
+                edate_gfs = self._base['EDATE']
+                edate_metp = edate_gfs.replace(hour=18)
+                edate_metp_diff = edate_metp - edate_gfs
+                offset = timedelta_to_HMS(-to_timedelta(f'{edate_metp_diff}H'))
                 dep_dict = {'type': 'task', 'name': f'{self.run}_arch_vrfy', 'offset': offset}
                 deps2.append(rocoto.add_dependency(dep_dict))
                 deps.append(rocoto.create_dependency(dep_condition='and', dep=deps2))
diff --git a/parm/stage/ice.yaml.j2 b/parm/stage/ice.yaml.j2
index 320145c4c82..22d26e98d2d 100644
--- a/parm/stage/ice.yaml.j2
+++ b/parm/stage/ice.yaml.j2
@@ -2,8 +2,8 @@
 {% if DO_JEDIOCNVAR == True and RUN == 'gdas' %}
     {% set START_ICE_FROM_ANA = True %}
 {% endif %}
-{% if DO_STARTMEM_FROM_JEDIICE == False and RUN == 'enkfgdas' %}
-    {% set START_ICE_FROM_ANA = False %}
+{% if DO_STARTMEM_FROM_JEDIICE == True and RUN == 'enkfgdas' %}
+    {% set START_ICE_FROM_ANA = True %}
 {% endif %}
 ice:
     {% if START_ICE_FROM_ANA == True %}