diff --git a/.gitmodules b/.gitmodules
index a963b019d8..10a93b7356 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,8 +24,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-main-20211220
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE
diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
index 6fdac6beb3..67f4d875c7 100644
--- a/MOM6-interface/CMakeLists.txt
+++ b/MOM6-interface/CMakeLists.txt
@@ -46,6 +46,7 @@ target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURR
                                                   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
                                              fms
+                                             stochastic_physics
                                              esmf)
 # OpenMP is disabled in MOM6
 #if(OpenMP_Fortran_FOUND)
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index 90d5961074..9642b1d7b0 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit 90d5961074b7856137817968800a62c5caa4530e
+Subproject commit 9642b1d7b0984fc34c10c39cdee091acf82918b7
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
index 259dc5e429..3125edbc2f 100644
--- a/MOM6-interface/mom6_files.cmake
+++ b/MOM6-interface/mom6_files.cmake
@@ -181,6 +181,8 @@ list(APPEND mom6_src_files
   MOM6/src/parameterizations/CVmix/cvmix_tidal.F90
   MOM6/src/parameterizations/CVmix/cvmix_utils.F90
 
+  MOM6/src/parameterizations/stochastic/MOM_stochastics.F90
+
   MOM6/src/tracer/DOME_tracer.F90
 
   MOM6/src/tracer/ISOMIP_tracer.F90
@@ -255,7 +257,6 @@ list(APPEND mom6_src_files
   MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
   MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
   MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
-  MOM6/config_src/external/OCEAN_stochastic_phyiscs/MOM_stochastics.F90
 
   MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
   MOM6/config_src/infra/FMS1/MOM_constants.F90