diff --git a/.gitmodules b/.gitmodules
index 5e5f8d221..35d0f7fd0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,19 +1,25 @@
 [submodule "fv3/atmos_cubed_sphere"]
   path = fv3/atmos_cubed_sphere
-  url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
-  branch = dev/emc
+  #url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere
+  #branch = dev/emc
+  url = https://github.com/gspetro-NOAA/atmos_cubed_sphere
+  branch = feature/ss2.x
 [submodule "ccpp/framework"]
   path = ccpp/framework
   url = https://github.com/NCAR/ccpp-framework
   branch = develop
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+  #url = https://github.com/ufs-community/ccpp-physics
+  #branch = ufs/dev
+  url = https://github.com/gspetro-NOAA/ccpp-physics.git
+  branch = feature/ss2.x
 [submodule "upp"]
   path = upp
-  url = https://github.com/NOAA-EMC/UPP
-  branch = develop
+  #url = https://github.com/NOAA-EMC/UPP
+  #branch = develop
+  url = https://github.com/gspetro-NOAA/UPP
+  branch = feature/ss2.x
 [submodule "mpas/MPAS-Model"]
   path = mpas/MPAS-Model
   url = https://github.com/ufs-community/MPAS-Model.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7fd01640..e46749ea7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,8 +305,8 @@ endif()
 
 # Always include EMC libraries in dycore install
 target_link_libraries(${DYCORE_TARGET} PUBLIC w3emc::w3emc_d
-                                              sp::sp_d
-                                              bacio::bacio_4
+                                              ip::ip_d
+                                              bacio::bacio
                                               ESMF::ESMF)
 
 # OpenMP
diff --git a/ccpp/physics b/ccpp/physics
index 6904ad4b5..a10652331 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 6904ad4b5563ca1a63203993b35fa68de794340f
+Subproject commit a1065233185d1e9d9247899107402b14ac95c97b
diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere
index ecb6c48b0..b4d8d20b7 160000
--- a/fv3/atmos_cubed_sphere
+++ b/fv3/atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit ecb6c48b0de1b903e921c863821533c50b99f149
+Subproject commit b4d8d20b704f608ea6140fe0605f13ec74806cbe
diff --git a/fv3/moving_nest/fv_moving_nest_main.F90 b/fv3/moving_nest/fv_moving_nest_main.F90
index c2274ba3f..aafa4112e 100644
--- a/fv3/moving_nest/fv_moving_nest_main.F90
+++ b/fv3/moving_nest/fv_moving_nest_main.F90
@@ -37,8 +37,8 @@ module fv_moving_nest_main_mod
 #endif
   use time_manager_mod,       only: time_type, get_time, get_date, set_time, operator(+), &
       operator(-), operator(/), time_type_to_real
-  use fms_mod,                only: file_exist, open_namelist_file,    &
-      close_file, error_mesg, FATAL,     &
+  use fms_mod,                only: &
+      error_mesg, FATAL,     &
       check_nml_error, stdlog,           &
       write_version_number,              &
       mpp_clock_id, mpp_clock_begin,     &
diff --git a/upp b/upp
index 7d9597c47..b49f9df5e 160000
--- a/upp
+++ b/upp
@@ -1 +1 @@
-Subproject commit 7d9597c471470be061ab8853dd62bcd03f15d6aa
+Subproject commit b49f9df5ee502e17b21a3a05fb74e82ba94ba90c