diff --git a/.gitmodules b/.gitmodules
index 5ece87098e..ce8d7b146f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = bugfix/gf_decomp_b4b
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
diff --git a/FV3 b/FV3
index 61f060f3c0..70c156f0c6 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 61f060f3c09192c0c53e867a1b14edea83b872fd
+Subproject commit 70c156f0c6cc457a854b7bbfbfb8ddd2011ab918
diff --git a/tests/rt.conf b/tests/rt.conf
index 6956c8ca85..97b0a126d6 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -65,13 +65,11 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRR
 RUN     | rap_control                                                                                                             |                                         | fv3 |
 RUN     | rap_rrtmgp                                                                                                              |                                         | fv3 |
 RUN     | regional_spp_sppt_shum_skeb                                                                                             |                                         | fv3 |
-# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
-#RUN     | rap_decomp                                                                                                              |                                         |     |
+RUN     | rap_decomp                                                                                                              |                                         |     |
 RUN     | rap_2threads                                                                                                            | - wcoss_cray jet.intel                  |     |
 RUN     | rap_restart                                                                                                             |                                         |     | rap_control
 RUN     | rap_sfcdiff                                                                                                             |                                         | fv3 |
-# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
-#RUN     | rap_sfcdiff_decomp                                                                                                      |                                         |     |
+RUN     | rap_sfcdiff_decomp                                                                                                      |                                         |     |
 RUN     | rap_sfcdiff_restart                                                                                                     |                                         |     | rap_sfcdiff
 RUN     | hrrr_control                                                                                                            |                                         | fv3 |
 RUN     | rrfs_v1beta                                                                                                             |                                         | fv3 |
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index 23355c9da0..cda7d6f926 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -17,13 +17,11 @@ RUN     | control_p8
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON                                     |                | fv3         |
 
 RUN     | rap_control                                                                                                             |                | fv3         |
-# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
-#RUN     | rap_decomp                                                                                                              |                |             |
+RUN     | rap_decomp                                                                                                              |                |             |
 RUN     | rap_2threads                                                                                                            |                |             |
 RUN     | rap_restart                                                                                                             |                |             | rap_control
 RUN     | rap_sfcdiff                                                                                                             |                | fv3         |
-# This test is not giving the same results (also not in REPRO mode) - needs to be fixed
-#RUN     | rap_sfcdiff_decomp                                                                                                      |                |             |
+RUN     | rap_sfcdiff_decomp                                                                                                      |                |             |
 RUN     | rap_sfcdiff_restart                                                                                                     |                |             | rap_sfcdiff
 RUN     | hrrr_control                                                                                                            |                | fv3         |
 RUN     | rrfs_v1beta                                                                                                             |                | fv3         |
diff --git a/tests/tests/regional_spp_sppt_shum_skeb b/tests/tests/regional_spp_sppt_shum_skeb
index 3a74589fff..3e4f3827d8 100644
--- a/tests/tests/regional_spp_sppt_shum_skeb
+++ b/tests/tests/regional_spp_sppt_shum_skeb
@@ -1,7 +1,7 @@
 ####################################################################
 #
 #  Regional test with stochastic physics (SPP, SPPT, SHUM, and SKEB)
-#  
+#
 ####################################################################
 
 export TEST_DESCR="Compare regional stochastic physics results with previous trunk version"
@@ -59,4 +59,4 @@ export SPP_TAU='21600.0,21600.0,21600.0,21600.0,21600.0'
 export SPP_SIGTOP1='0.1,0.1,0.1,0.1,0.1'
 export SPP_SIGTOP2='0.025,0.025,0.025,0.025,0.025'
 export SPP_STDDEV_CUTOFF='1.5,1.5,2.5,1.5,1.5'
-export ISEED_SPP='4,4,4,4,4'  
+export ISEED_SPP='4,4,4,4,4'