diff --git a/.gitmodules b/.gitmodules
index 8b5b737335..61c8246695 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-20211019
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index 36f17eb566..fd02017ec6 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit 36f17eb566aede29b5644c279cf1c40c600d7c86
+Subproject commit fd02017ec6c4e7e3f03bbb9592502d749e55ae52
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
index 5dbfedc9af..259dc5e429 100644
--- a/MOM6-interface/mom6_files.cmake
+++ b/MOM6-interface/mom6_files.cmake
@@ -189,6 +189,7 @@ list(APPEND mom6_src_files
   MOM6/src/tracer/MOM_generic_tracer.F90
   MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
   MOM6/src/tracer/MOM_neutral_diffusion.F90
+  MOM6/src/tracer/nw2_tracers.F90
   MOM6/src/tracer/MOM_offline_aux.F90
   MOM6/src/tracer/MOM_offline_main.F90
   MOM6/src/tracer/MOM_tracer_Z_init.F90