diff --git a/.gitmodules b/.gitmodules
index ffe6e98ef4..da382376a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
 	path = FV3
-	url = https://github.com/NOAA-GSD/fv3atm
-	branch = gsd/develop
+	#url = https://github.com/NOAA-GSD/fv3atm
+	#branch = gsd/develop
+	url = https://github.com/climbfuji/fv3atm
+	branch = rucice_gfsv16dzmin
 [submodule "NEMS"]
 	path = NEMS
 	url = https://github.com/NOAA-EMC/NEMS
diff --git a/FV3 b/FV3
index bf64848029..5fba7da515 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit bf64848029ea275d92a3f4f615cbe944418bfbeb
+Subproject commit 5fba7da51515d1d742b5d07b046b0b56d859f72d
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 02daa2e065..e4af6482d0 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -165,6 +165,7 @@ export DO_MYNNSFCLAY=.F.
 export LSM=1
 export LSOIL_LSM=4
 export LANDICE=.T.
+export KICE=2
 
 # Ozone / stratospheric H2O
 export OZ_PHYS_OLD=.T.
diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
index b300fb42bc..3e6860cb2f 100644
--- a/tests/parm/ccpp_gsd.nml.IN
+++ b/tests/parm/ccpp_gsd.nml.IN
@@ -176,6 +176,7 @@
        n_var_lndp     = @[N_VAR_LNDP]
        lsm            = @[LSM]
        lsoil_lsm      = @[LSOIL_LSM]
+       kice           = @[KICE]
        iopt_dveg      = 2
        iopt_crs       = 1
        iopt_btr       = 1
diff --git a/tests/parm/ccpp_gsd_sar.nml.IN b/tests/parm/ccpp_gsd_sar.nml.IN
index 1cce078375..40998fcc1f 100644
--- a/tests/parm/ccpp_gsd_sar.nml.IN
+++ b/tests/parm/ccpp_gsd_sar.nml.IN
@@ -198,6 +198,7 @@
        lsm            = 3
        lsoil          = 4
        lsoil_lsm      = 9
+       kice           = 9
        iopt_dveg      = 2
        iopt_crs       = 1
        iopt_btr       = 1
diff --git a/tests/parm/ccpp_gsd_sar_25km.nml.IN b/tests/parm/ccpp_gsd_sar_25km.nml.IN
index 39d40f8162..ec5c0869f2 100644
--- a/tests/parm/ccpp_gsd_sar_25km.nml.IN
+++ b/tests/parm/ccpp_gsd_sar_25km.nml.IN
@@ -199,6 +199,7 @@
      lsm            = 3
      lsoil          = 9
      lsoil_lsm      = 9
+     kice           = 9
      iopt_dveg      = 2
      iopt_crs       = 1
      iopt_btr       = 1
diff --git a/tests/tests/fv3_ccpp_gsd b/tests/tests/fv3_ccpp_gsd
index 442117df57..077446b405 100644
--- a/tests/tests/fv3_ccpp_gsd
+++ b/tests/tests/fv3_ccpp_gsd
@@ -118,7 +118,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_coldstart b/tests/tests/fv3_ccpp_gsd_coldstart
index e43553acb8..d1343f0b9b 100644
--- a/tests/tests/fv3_ccpp_gsd_coldstart
+++ b/tests/tests/fv3_ccpp_gsd_coldstart
@@ -56,4 +56,4 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_ccpp_gsd_debug
index 2e2d073d4d..e665bbf9e3 100644
--- a/tests/tests/fv3_ccpp_gsd_debug
+++ b/tests/tests/fv3_ccpp_gsd_debug
@@ -94,6 +94,6 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
diff --git a/tests/tests/fv3_ccpp_gsd_diag3d_debug b/tests/tests/fv3_ccpp_gsd_diag3d_debug
index 2f46c151e6..cade76ed3e 100644
--- a/tests/tests/fv3_ccpp_gsd_diag3d_debug
+++ b/tests/tests/fv3_ccpp_gsd_diag3d_debug
@@ -98,7 +98,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_ccpp_gsd_drag_suite
index 6788e03d3a..fc014ac654 100644
--- a/tests/tests/fv3_ccpp_gsd_drag_suite
+++ b/tests/tests/fv3_ccpp_gsd_drag_suite
@@ -94,8 +94,8 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 export GWD_OPT=3
 
-
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_ccpp_gsd_mynnsfc
index 8d39c21413..fae4d8512b 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc
+++ b/tests/tests/fv3_ccpp_gsd_mynnsfc
@@ -120,6 +120,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 
 RUN_SCRIPT=rt_fv3.sh
 
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
index a394908ad7..21d9901715 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
+++ b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
@@ -96,6 +96,7 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
+export KICE=9
 
 RUN_SCRIPT=rt_fv3.sh
 
diff --git a/tests/tests/fv3_ccpp_gsd_warmstart b/tests/tests/fv3_ccpp_gsd_warmstart
index 3904d145b9..0d9d28950d 100644
--- a/tests/tests/fv3_ccpp_gsd_warmstart
+++ b/tests/tests/fv3_ccpp_gsd_warmstart
@@ -96,4 +96,4 @@ export IMFSHALCNV=3
 export IMFDEEPCNV=3
 export LSM=3
 export LSOIL_LSM=9
-
+export KICE=9