diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
index a96b067ac..268eb2166 100755
--- a/ccpp/config/ccpp_prebuild_config.py
+++ b/ccpp/config/ccpp_prebuild_config.py
@@ -186,9 +186,9 @@
     'physics/physics/noahmpdrv.F90',
     'physics/physics/flake_driver.F90',
     'physics/physics/clm_lake.f90',
-    'physics/physics/sfc_nst_pre.f',
-    'physics/physics/sfc_nst.f',
-    'physics/physics/sfc_nst_post.f',
+    'physics/physics/sfc_nst_pre.f90',
+    'physics/physics/sfc_nst.f90',
+    'physics/physics/sfc_nst_post.f90',
     'physics/physics/sfc_ocean.F',
     'physics/physics/sfc_sice.f',
     # HAFS FER_HIRES
diff --git a/ccpp/physics b/ccpp/physics
index ade9c106a..a77ed1647 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit ade9c106a4bc32fa622341b76449070c912fd7a2
+Subproject commit a77ed1647440a3acd83625f46b1605f8b8239093