diff --git a/.gitmodules b/.gitmodules
index 9dca13dffd..fe709d4e4f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,8 +28,8 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-  url = https://github.com/NOAA-EMC/MOM6
-  branch = dev/emc
+  url = https://github.com/jiandewang/MOM6
+  branch = feature/update-to-GFDL-20210914
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index f8a8e4c4c7..29016c20a1 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit f8a8e4c4c721830f08ccc83a662fb8215eefa0cf
+Subproject commit 29016c20a10e2497b00513ba14fe7b023026a4d1
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
index 5cc966c7b5..c30e5f35a8 100644
--- a/MOM6-interface/mom6_files.cmake
+++ b/MOM6-interface/mom6_files.cmake
@@ -206,6 +206,7 @@ list(APPEND mom6_src_files
   MOM6/src/tracer/oil_tracer.F90
   MOM6/src/tracer/pseudo_salt_tracer.F90
   MOM6/src/tracer/tracer_example.F90
+  MOM6/src/tracer/MOM_CFC_cap.F90
 
   MOM6/src/user/BFB_initialization.F90
   MOM6/src/user/BFB_surface_forcing.F90