diff --git a/.gitmodules b/.gitmodules
index 22c723ac1..ecc0aa03d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,8 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+  url = https://github.com/SamuelTrahanNOAA/ccpp-physics
+  branch = bugfix/errmsgflg-race-condition
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP
diff --git a/ccpp/physics b/ccpp/physics
index 31a99de05..671b5f063 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 31a99de05048187b61a2ea8381417b8dbd8db7e0
+Subproject commit 671b5f063f8d1540b4e0d5d678ac50005aa18c79