diff --git a/.gitmodules b/.gitmodules
index 0c3b70cc3f..84a75ca929 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/YihuaWu-NOAA/fv3atm
+  branch = flake
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
diff --git a/FV3 b/FV3
index ddb56fe83e..237f078190 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit ddb56fe83ee75b62bcc9dd03f74228f569a76ff0
+Subproject commit 237f078190ab48639cc0e688a4f843644bc98adc
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index a729a7fb40..cdc7690f41 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit a729a7fb400d8d441868606abdb3e722ceb2b8f5
+Subproject commit cdc7690f41fb747df435a07b92dcf3fa02420a6b