diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist
index fd7fdcfe445c..7493d6a28e17 100755
--- a/components/mpas-ocean/bld/build-namelist
+++ b/components/mpas-ocean/bld/build-namelist
@@ -595,6 +595,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
 #########################
 
 add_default($nl, 'config_use_cvmix');
+add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
 add_default($nl, 'config_cvmix_prandtl_number');
 add_default($nl, 'config_use_cvmix_background');
 add_default($nl, 'config_cvmix_background_diffusion');
diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section
index ebbe60239a12..82c1855bc8dc 100644
--- a/components/mpas-ocean/bld/build-namelist-section
+++ b/components/mpas-ocean/bld/build-namelist-section
@@ -136,6 +136,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
 #########################
 
 add_default($nl, 'config_use_cvmix');
+add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
 add_default($nl, 'config_cvmix_prandtl_number');
 add_default($nl, 'config_use_cvmix_background');
 add_default($nl, 'config_cvmix_background_diffusion');
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
index 9cbb0cbe2461..cee2dd665637 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -172,6 +172,7 @@
 
 <!-- cvmix -->
 <config_use_cvmix>.true.</config_use_cvmix>
+<config_cvmix_use_kpp_buoyancyForcing_fix>.true.</config_cvmix_use_kpp_buoyancyForcing_fix>
 <config_cvmix_prandtl_number>1.0</config_cvmix_prandtl_number>
 <config_use_cvmix_background>.true.</config_use_cvmix_background>
 <config_cvmix_background_diffusion>0.0</config_cvmix_background_diffusion>
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
index d1c70bb78a31..73b551713ec5 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
@@ -595,6 +595,14 @@ Valid values: True or False
 Default: Defined in namelist_defaults.xml
 </entry>
 
+<entry id="config_cvmix_use_kpp_buoyancyForcing_fix" type="logical"
+	category="cvmix" group="cvmix">
+If true CVMix KPP buoyancy forcing fix for sea ice is enabled
+
+Valid values: True or False
+Default: Defined in namelist_defaults.xml
+</entry>
+
 <entry id="config_cvmix_prandtl_number" type="real"
 	category="cvmix" group="cvmix">
 Prandtl number to be used within the CVMix parameterization suite