diff --git a/algorithm/marine/soca_2cice_global.yaml.j2 b/algorithm/marine/soca_2cice_global.yaml.j2
index 0798d02..8d13d46 100644
--- a/algorithm/marine/soca_2cice_global.yaml.j2
+++ b/algorithm/marine/soca_2cice_global.yaml.j2
@@ -29,7 +29,13 @@ variable change:
     sno_lev: 1
   cice output:
     restart: {{ ice_rst }}
-  output variables: [sea_water_potential_temperature, sea_water_salinity, sea_water_cell_thickness, sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness]
+  output variables:
+  - sea_water_potential_temperature
+  - sea_water_salinity
+  - sea_water_cell_thickness
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
 
 states:
 - input:
@@ -38,7 +44,14 @@ states:
      ocn_filename: {{ ocn_ana }}
      ice_filename: {{ ice_ana }}
      date: '{{ fcst_begin }}'
-     state variables: [sea_water_potential_temperature, sea_water_salinity, sea_water_cell_thickness, sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness]
+     state variables:
+     - sea_water_potential_temperature
+     - sea_water_salinity
+     - sea_water_cell_thickness
+     - sea_ice_area_fraction
+     - sea_ice_thickness
+     - sea_ice_snow_thickness
+
   output:
      datadir: Data
      exp: soca2cice
diff --git a/algorithm/marine/soca_diagb.yaml.j2 b/algorithm/marine/soca_diagb.yaml.j2
index 02633ac..30e9c68 100644
--- a/algorithm/marine/soca_diagb.yaml.j2
+++ b/algorithm/marine/soca_diagb.yaml.j2
@@ -18,9 +18,20 @@ background error:
   type: incr
 
 variables:
-  name: [sea_water_potential_temperature, sea_water_salinity, eastward_sea_water_velocity, northward_sea_water_velocity, sea_water_cell_thickness, sea_surface_height_above_geoid, sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, mom6_mld]
+  name:
+  - sea_water_potential_temperature
+  - sea_water_salinity
+  - eastward_sea_water_velocity
+  - northward_sea_water_velocity
+  - sea_water_cell_thickness
+  - sea_surface_height_above_geoid
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
+  - mom6_mld
 
-rescale: 2.0    # rescales the filtered std. dev. by "rescale"
+vertical e-folding scale: 500.0
+rescale: 1.0    # rescales the filtered std. dev. by "rescale"
 min sst: 0.0    # Added to sst bkg. err.
 max ssh: 0.0    # Limits the amplitude of the unbalanced bkg err
 min depth: 500.0 # zero out the bkg. error. at less than min depth
diff --git a/algorithm/marine/soca_ensb.yaml.j2 b/algorithm/marine/soca_ensb.yaml.j2
index 01c9777..852850f 100644
--- a/algorithm/marine/soca_ensb.yaml.j2
+++ b/algorithm/marine/soca_ensb.yaml.j2
@@ -5,11 +5,20 @@ geometry:
 
 date: '{{ marine_window_begin_iso }}'
 
-layers variable: [hocn]
+layers variable: [sea_water_cell_thickness]
 
-increment variables: [tocn, socn, uocn, vocn, ssh, hocn, cicen, hicen, hsnon]
+increment variables:
+- sea_water_potential_temperature
+- sea_water_salinity
+- eastward_sea_water_velocity
+- northward_sea_water_velocity
+- sea_surface_height_above_geoid
+- sea_water_cell_thickness
+- sea_ice_area_fraction
+- sea_ice_thickness
+- sea_ice_snow_thickness
 
-set increment variables to zero: [ssh]
+set increment variables to zero: [sea_surface_height_above_geoid]
 
 vertical geometry:
   date: '{{ marine_window_begin_iso }}'
@@ -81,7 +90,18 @@ linear variable change:
   - linear variable change name: BalanceSOCA
 
 trajectory:
-  state variables: [tocn, socn, uocn, vocn, ssh, hocn, layer_depth, mld, cicen, hicen, hsnon]
+  state variables:
+  - sea_water_potential_temperature
+  - sea_water_salinity
+  - eastward_sea_water_velocity
+  - northward_sea_water_velocity
+  - sea_surface_height_above_geoid
+  - sea_water_cell_thickness
+  - sea_water_depth
+  - ocean_mixed_layer_thickness
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
   date: '{{ marine_window_begin_iso }}'
   basename: ./INPUT/
   ocn_filename: MOM.res.nc
@@ -89,8 +109,7 @@ trajectory:
   read_from_file: 1
 
 output increment:
-  # TODO: Revert this when fms can take more than 128 charactres file names
-  datadir: '{{ enspert_relpath }}/enspert/'
+  datadir: '{{ enspert_relpath }}/'
   date: '{{ marine_window_begin_iso }}'
   exp: trash
   type: incr
diff --git a/algorithm/marine/soca_ensweights.yaml.j2 b/algorithm/marine/soca_ensweights.yaml.j2
index 792bbdc..9f818b3 100644
--- a/algorithm/marine/soca_ensweights.yaml.j2
+++ b/algorithm/marine/soca_ensweights.yaml.j2
@@ -5,8 +5,17 @@ geometry:
 date: '{{ marine_window_middle_iso }}'
 
 variables:
-  ice: [cicen, hicen, hsnon]
-  ocean: [tocn, socn, uocn, vocn, ssh]
+  ice:
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
+
+  ocean:
+  - sea_water_potential_temperature
+  - sea_water_salinity
+  - eastward_sea_water_velocity
+  - northward_sea_water_velocity
+  - sea_surface_height_above_geoid
 
 background:
   date: '{{ marine_window_begin_iso }}'
diff --git a/algorithm/marine/soca_parameters_diffusion_hz.yaml.j2 b/algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
index c79d469..a0fc0e1 100644
--- a/algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
+++ b/algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
@@ -30,8 +30,11 @@ background error:
         write:
           filepath: ./staticb/hz_ocean
 
-      - horizontal:
-          as gaussian: true
-          fixed value: 50000.0
-        write:
-          filepath: ./staticb/hz_ice
+# TODO(G): OK to not use what's below but it will need
+#          to be fixed when we add ice thickness and
+#          snow depth
+#      - horizontal:
+#          as gaussian: true
+#          fixed value: 50000.0
+#        write:
+#          filepath: ./staticb/hz_ice
diff --git a/model/marine/marine_background_error_static_diffusion.yaml.j2 b/model/marine/marine_background_error_static_diffusion.yaml.j2
index 0c57790..4b31572 100644
--- a/model/marine/marine_background_error_static_diffusion.yaml.j2
+++ b/model/marine/marine_background_error_static_diffusion.yaml.j2
@@ -3,15 +3,22 @@ saber central block:
   saber block name: diffusion
   read:
     groups:
-    - variables: [sea_water_potential_temperature, sea_water_salinity, sea_surface_height_above_geoid]
+    - variables:
+      - sea_water_potential_temperature
+      - sea_water_salinity
+      - sea_surface_height_above_geoid
+      - sea_ice_area_fraction
       horizontal:
         filepath: ./staticb/hz_ocean
       vertical:
         levels: {{marine_vt_levels}}
         filepath: ./staticb/vt_ocean
-    - variables: [sea_ice_area_fraction]
-      horizontal:
-        filepath: ./staticb/hz_ice
+# TODO(G): OK to not use what's below but it will need
+#          to be fixed when we add ice thickness and
+#          snow depth
+#    - variables: [sea_ice_area_fraction]
+#      horizontal:
+#        filepath: ./staticb/hz_ice
 
 saber outer blocks:
 - saber block name: StdDev
@@ -24,7 +31,23 @@ saber outer blocks:
       read_from_file: 3
 
 linear variable change:
-  input variables: [sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, sea_water_salinity, sea_water_potential_temperature, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid]
-  output variables: [sea_ice_area_fraction, sea_ice_thickness, sea_ice_snow_thickness, sea_water_salinity, sea_water_potential_temperature, eastward_sea_water_velocity, northward_sea_water_velocity, sea_surface_height_above_geoid]
+  input variables:
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
+  - sea_water_salinity
+  - sea_water_potential_temperature
+  - eastward_sea_water_velocity
+  - northward_sea_water_velocity
+  - sea_surface_height_above_geoid
+  output variables:
+  - sea_ice_area_fraction
+  - sea_ice_thickness
+  - sea_ice_snow_thickness
+  - sea_water_salinity
+  - sea_water_potential_temperature
+  - eastward_sea_water_velocity
+  - northward_sea_water_velocity
+  - sea_surface_height_above_geoid
   linear variable changes:
   - linear variable change name: BalanceSOCA