diff --git a/.gitmodules b/.gitmodules
index 82a96cfeb7..9bb6332fa7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/ufsatm
-  branch = develop
+  url = https://github.com/mkavulich/ufsatm
+  branch = rrfs_smoke_bugfix
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
@@ -48,5 +48,5 @@
   branch = develop
 [submodule "fire_behavior"]
   path = fire_behavior
-  url = https://github.com/NOAA-EMC/fire_behavior
-  branch = emc/develop
+  url = https://github.com/NCAR/fire_behavior
+  branch = fixes_for_ufs
diff --git a/UFSATM b/UFSATM
index 07467d034c..6babd3043b 160000
--- a/UFSATM
+++ b/UFSATM
@@ -1 +1 @@
-Subproject commit 07467d034ca55c00fcd1a9710a44f7b3c7877052
+Subproject commit 6babd3043ba3c08ae97bcf824a3c59abfcf24b3c
diff --git a/fire_behavior b/fire_behavior
index 23a6e57b5b..6ae8078a5a 160000
--- a/fire_behavior
+++ b/fire_behavior
@@ -1 +1 @@
-Subproject commit 23a6e57b5bb6b9288a7ff1fbbd20a599e908f718
+Subproject commit 6ae8078a5ad9056f4259fcdef918961df2cedf54