diff --git a/parm/soca/berror/soca_diagb.yaml.j2 b/parm/soca/berror/soca_diagb.yaml.j2
index 1493ea1d4..c0597d358 100644
--- a/parm/soca/berror/soca_diagb.yaml.j2
+++ b/parm/soca/berror/soca_diagb.yaml.j2
@@ -12,7 +12,7 @@ background:
   read_from_file: 1
 
 background error:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
   exp: bkgerr_stddev
   type: incr
diff --git a/parm/soca/berror/soca_ensb.yaml.j2 b/parm/soca/berror/soca_ensb.yaml.j2
index a23b365fe..4033f41ba 100644
--- a/parm/soca/berror/soca_ensb.yaml.j2
+++ b/parm/soca/berror/soca_ensb.yaml.j2
@@ -34,44 +34,44 @@ steric height:
   - linear variable change name: BalanceSOCA  # Only the steric balance is applied
 
 ensemble mean output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: ens_mean
   type: incr
 
 ssh output:
   unbalanced:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_unbal_stddev
     type: incr
 
   steric:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_steric_stddev
     type: incr
 
   total:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_total_stddev
     type: incr
 
   explained variance:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: steric_explained_variance
     type: incr
 
   recentering error:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_recentering_error
     type: incr
 
 background error output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: bkgerr_stddev
   type: incr
diff --git a/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
index 759a0ed03..d03cc5ba9 100644
--- a/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
+++ b/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
@@ -27,11 +27,11 @@ background error:
             filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
             variable name: ave_ssh
         write:
-          filename: hz_ocean.nc
+          filename: ./staticb/hz_ocean.nc
 
       - name: ice
         horizontal:
           as gaussian: true
           fixed value: 50000.0
         write:
-          filename: hz_ice.nc
+          filename: ./staticb/hz_ice.nc
diff --git a/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
index c740b37a7..ed08b6ab8 100644
--- a/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
+++ b/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
@@ -29,4 +29,4 @@ background error:
             filename: vt_scales.nc
             variable name: vt
         write:
-          filename: vt_ocean.nc
+          filename: ./staticb/vt_ocean.nc
diff --git a/parm/soca/berror/soca_vtscales.yaml.j2 b/parm/soca/berror/soca_vtscales.yaml.j2
index 0b5d7a104..d5662a4e5 100644
--- a/parm/soca/berror/soca_vtscales.yaml.j2
+++ b/parm/soca/berror/soca_vtscales.yaml.j2
@@ -1,6 +1,6 @@
 gridspec_filename: soca_gridspec.nc
 restart_filename: ./INPUT/MOM.res.nc
-mld_filename: './diagb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
+mld_filename: './staticb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
 output_filename: ./vt_scales.nc
 output_variable_vt: vt
 output_variable_hz: hz
diff --git a/parm/soca/varchange/soca_2cice_antarctic.yaml b/parm/soca/varchange/soca_2cice_antarctic.yaml
deleted file mode 100644
index 59c1051ce..000000000
--- a/parm/soca/varchange/soca_2cice_antarctic.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-input geometry:
-  mom6_input_nml: mom_input.nml
-  fields metadata: fields_metadata.yaml
-  geom_grid_file: soca_gridspec.nc
-
-output geometry:
-  mom6_input_nml: mom_input.nml
-  fields metadata: fields_metadata.yaml
-  geom_grid_file: soca_gridspec.nc
-
-variable change:
-  variable change name: Soca2Cice
-  do inverse: false
-  seaice edge: 0.9
-  shuffle: false  # seg. fault when true 
-  rescale prior:
-    min hice: 0.5
-    min hsno: 0.1
-  domain: antarctic
-  cice background state:
-    restart: $(ICE_RST)
-    grid: ' '
-    ncat: 5
-    ice_lev: 7
-    sno_lev: 1
-    tstep: PT1H
-  cice output:
-    restart: $(ICE_RST)
-  output variables: [tocn, socn, hocn, cicen, hicen, hsnon]
-
-states:
-- input:
-     read_from_file: 1
-     basename: ./
-     ocn_filename: $(OCN_ANA)
-     ice_filename: $(ICE_ANA)
-     date: $(FCST_BEGIN)
-     state variables: [tocn, socn, hocn, cicen, hicen, hsnon]
-  output:
-     datadir: Data
-     exp: soca2cice
-     type: fc
-     date: $(FCST_BEGIN)
diff --git a/parm/soca/varchange/soca_2cice_arctic.yaml b/parm/soca/varchange/soca_2cice_arctic.yaml
deleted file mode 100644
index 075ee018c..000000000
--- a/parm/soca/varchange/soca_2cice_arctic.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-input geometry:
-  mom6_input_nml: mom_input.nml
-  fields metadata: ./fields_metadata.yaml
-
-output geometry:
-  mom6_input_nml: mom_input.nml
-  fields metadata: ./fields_metadata.yaml
-
-variable change:
-  variable change name: Soca2Cice
-  do inverse: false
-  seaice edge: 0.8
-  shuffle: false
-  rescale prior:
-    min hice: 0.5
-    min hsno: 0.1
-  domain: arctic
-  cice background state:
-    restart: $(ICE_RST)
-    ncat: 5
-    ice_lev: 7
-    sno_lev: 1
-    tstep: PT1H
-  cice output:
-    restart: $(ICE_RST)
-  output variables: [tocn, socn, hocn, cicen, hicen, hsnon]
-
-states:
-- input:
-     read_from_file: 1
-     basename: ./
-     ocn_filename: $(OCN_ANA)
-     ice_filename: $(ICE_ANA)
-     date: $(FCST_BEGIN)
-     state variables: [tocn, socn, hocn, cicen, hicen, hsnon]
-  output:
-     datadir: Data
-     exp: soca2cice
-     type: fc
-     date: $(FCST_BEGIN)
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
index 2e17f18fa..482d486b0 100644
--- a/test/gw-ci/CMakeLists.txt
+++ b/test/gw-ci/CMakeLists.txt
@@ -56,9 +56,9 @@ set(TASK_LIST
   "gdasmarinebmat"
   "gdasmarineanlinit"
   "gdasmarineanlvar"
-  "gdasocnanalchkpt"
+  "gdasmarineanlchkpt"
   "gdasocnanalpost"
-  )
+w  )
 add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${TASK_LIST}")
 
 # Aero-Land DA, C96
@@ -81,10 +81,10 @@ set(pslot "GFSv17-3DVAR-C384mx025")
 set(YAML_PATH ${HOMEgfs}/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml)
 set(TASK_LIST
   "gdasprepoceanobs"
-  "gdasocnanalprep"
-  "gdasocnanalbmat"
-  "gdasocnanalrun"
-  "gdasocnanalchkpt"
+  "gdasmarinebmat"
+  "gdasmarineanlinit"
+  "gdasmarineanlvar"
+  "gdasmarineanlchkpt"
   "gdasocnanalpost"
   "gdasocnanalvrfy"
   "gdasprep"