diff --git a/dev/parm/config/gfs/config.marinebmat b/dev/parm/config/gfs/config.marinebmat
index a62d96ab113..6ab92953cce 100644
--- a/dev/parm/config/gfs/config.marinebmat
+++ b/dev/parm/config/gfs/config.marinebmat
@@ -10,5 +10,6 @@ source "${EXPDIR}/config.resources" marinebmat
 
 export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"
 export SAVE_YAML="${PARMgfs}/gdas/marine/marine_bmat_save.yaml.j2"
+export COPY_BMAT_BKGERR_YAML="${PARMgfs}/gdas/marine/marine_bmat_copy_bkgerr.yaml.j2"
 
 echo "END: config.marinebmat"
diff --git a/parm/archive/gdasocean_analysis.yaml.j2 b/parm/archive/gdasocean_analysis.yaml.j2
index 010be3f8db7..e78d133c95b 100644
--- a/parm/archive/gdasocean_analysis.yaml.j2
+++ b/parm/archive/gdasocean_analysis.yaml.j2
@@ -19,8 +19,8 @@ gdasocean_analysis:
         {% endfor %}
 
         # static background error
-        - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
-        - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
+        - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_parametric_stddev.nc'
+        - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_parametric_stddev.nc'
 
         # ensemble background error
         {% if NMEM_ENS > 2 %}
@@ -28,6 +28,8 @@ gdasocean_analysis:
         - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.ens_weights.nc'
         - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.recentering_error.nc'
         - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.recentering_error.nc'
+        - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
+        - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
         {% for diag_type in ["ssh_steric_stddev", "ssh_unbal_stddev", "ssh_total_stddev", "steric_explained_variance"] %}
         - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.{{ diag_type }}.nc'
         {% endfor %}
diff --git a/parm/archive/gfsocean_analysis.yaml.j2 b/parm/archive/gfsocean_analysis.yaml.j2
index adca377104b..8bfef48b108 100644
--- a/parm/archive/gfsocean_analysis.yaml.j2
+++ b/parm/archive/gfsocean_analysis.yaml.j2
@@ -19,8 +19,8 @@ gfsocean_analysis:
         {% endfor %}
 
         # static background error
-        - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_ens_stddev.nc'
-        - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_ens_stddev.nc'
+        - '{{ COMIN_OCEAN_BMATRIX | relpath(ROTDIR) }}/{{ head }}ocean.bkgerr_parametric_stddev.nc'
+        - '{{ COMIN_ICE_BMATRIX | relpath(ROTDIR) }}/{{ head }}ice.bkgerr_parametric_stddev.nc'
 
         # runtime configs
         - '{{ COMIN_CONF | relpath(ROTDIR) }}/*.yaml'
diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index 77f286df1e6..fe812db8d8a 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit 77f286df1e640551ec23b0909adf71fd5f2c57e5
+Subproject commit fe812db8d8aa9a91f97ae1c97c212aad4b095c4f
diff --git a/ush/python/pygfs/task/marine_bmat.py b/ush/python/pygfs/task/marine_bmat.py
index c9707a47469..ab32fc88bdf 100644
--- a/ush/python/pygfs/task/marine_bmat.py
+++ b/ush/python/pygfs/task/marine_bmat.py
@@ -212,12 +212,9 @@ def finalize(self: Task) -> None:
         None
         """
 
-        # TODO(AFE) the two renames are to accomodate yaml settings in var task, which should changed
-        # ocean diag B
-        os.rename(os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.incr.{self.task_config.MARINE_WINDOW_END_ISO}.nc"),
-                  os.path.join(self.task_config.DATAstaticb, f"ocn.bkgerr_stddev.nc"))
-        os.rename(os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.incr.{self.task_config.MARINE_WINDOW_END_ISO}.nc"),
-                  os.path.join(self.task_config.DATAstaticb, f"ice.bkgerr_stddev.nc"))
+        logger.info(f"Copying background error files to new filenames")
+        bkgerr_list = parse_j2yaml(self.task_config.COPY_BMAT_BKGERR_YAML, self.task_config)
+        FileHandler(bkgerr_list).sync()
 
         # Save output files to COM
         logger.info(f"Copy files to ROTDIR")