diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
index 9cc3d3c03a..11a13f0bc3 100644
--- a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
+++ b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
@@ -4,7 +4,7 @@ experiment:
 
 arguments:
   pslot: {{ 'pslot' | getenv }}
-  app: S2S
+  app: S2SW
   resdetatmos: 48
   resdetocean: 5.0
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
@@ -13,7 +13,7 @@ arguments:
   idate: 2021032418
   edate: 2021032500
   nens: 0
-  interval: 0
+  interval: 6
   start: warm
   yaml: {{ HOMEgfs }}/ci/cases/yamls/soca_gfs_defaults_ci.yaml
 
diff --git a/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/ci/cases/yamls/soca_gfs_defaults_ci.yaml
index dbddcf23bb..3f5b5c0824 100644
--- a/ci/cases/yamls/soca_gfs_defaults_ci.yaml
+++ b/ci/cases/yamls/soca_gfs_defaults_ci.yaml
@@ -3,6 +3,7 @@ defaults:
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_JEDIOCNVAR: "YES"
+  DO_METP: "NO"
 
 marineanl:
   SOCA_NINNER: 1
diff --git a/parm/archive/gdaswave.yaml.j2 b/parm/archive/gdaswave.yaml.j2
index 109c70c181..3f140c7062 100644
--- a/parm/archive/gdaswave.yaml.j2
+++ b/parm/archive/gdaswave.yaml.j2
@@ -4,5 +4,15 @@ gdaswave:
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gdaswave.tar"
     required:
         # TODO explicitly name the wave grid/station files to archive
-        - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*"
+        {% set WAVE_OUT_GRIDS_list = WAVE_OUT_GRIDS.split(' ') %}
+        {% for grd in WAVE_OUT_GRIDS_list %}
+        {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                              '${RUN}':RUN,
+                              '${YMD}':cycle_YMD,
+                              '${HH}':cycle_HH,
+                              '${MEMDIR}':'',
+                              '${GRDRESNAME}':grd}) %}
+        {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %}
+        - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*"
+        {% endfor %}
         - "{{ COMIN_WAVE_STATION | relpath(ROTDIR) }}/{{ head }}*"
diff --git a/parm/archive/gfswave.yaml.j2 b/parm/archive/gfswave.yaml.j2
index 550ecdb1be..8d02d28dec 100644
--- a/parm/archive/gfswave.yaml.j2
+++ b/parm/archive/gfswave.yaml.j2
@@ -1,6 +1,6 @@
 gfswave:
     {% set head = "gfswave.t" + cycle_HH + "z." %}
- 
+
     name: "GFSWAVE"
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gfswave.tar"
     required:
@@ -13,8 +13,8 @@ gfswave:
                               '${HH}':cycle_HH,
                               '${MEMDIR}':'',
                               '${GRDRESNAME}':grd}) %}
-        {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %}        
-  
+        {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %}
+
         {% for fh in range(0, FHMAX_HF_WAV + FHOUT_HF_WAV, FHOUT_HF_WAV) %}
         # NOTE This is as explicit as possible without major logic to parse wavepostGRD.
         #      Matches files of the form "gfswave.tCCz.<region>.<res>.fHHH.grib2".
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index 2b2bd30b81..389d157df2 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -1233,7 +1233,7 @@ def wavepostsbs(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
 
-        fhrs = self._get_forecast_hours('gfs', self._configs['wavepostsbs'], 'wave')
+        fhrs = self._get_forecast_hours(self.run, self._configs['wavepostsbs'], 'wave')
         max_tasks = self._configs['wavepostsbs']['MAX_TASKS']
         fhr_var_dict = self.get_grouped_fhr_dict(fhrs=fhrs, ngroups=max_tasks)