diff --git a/.gitmodules b/.gitmodules
index d648fcb8f9..40b5c17cff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/grantfirl/fv3atm
+  branch = rrfsv1-to-ufs/dev1
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
diff --git a/FV3 b/FV3
index 1aba87cb30..d7e59fa20a 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 1aba87cb308fb52912e7fe6dd6b53d0ce7077554
+Subproject commit d7e59fa20af0bb84fdd4e058d310da4eb15ba282
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
index 6b8cae0ef6..2cc4648027 100644
--- a/cmake/Intel.cmake
+++ b/cmake/Intel.cmake
@@ -21,7 +21,7 @@ endif()
 if(DEBUG)
     add_definitions(-DDEBUG)
     #set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays")
-    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays")
+    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check all -check noarg_temp_created -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
 else()
     if(FASTER)