diff --git a/.gitmodules b/.gitmodules
index 8b5b737335..76ce6f862c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/DusanJovic-NOAA/fv3atm
+  branch = upp_submodule
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acea94d4f6..35d79b050d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,9 +127,6 @@ endif()
 find_package(bacio REQUIRED)
 find_package(sp REQUIRED)
 find_package(w3nco REQUIRED)
-if(INLINE_POST)
-  find_package(upp REQUIRED)
-endif()
 
 # Configure Python
 find_package(Python 3 REQUIRED COMPONENTS Interpreter)
diff --git a/FV3 b/FV3
index 08b710b1bd..17d2bb34fa 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 08b710b1bd74136ba36751f904589f660490baab
+Subproject commit 17d2bb34fa88dd91a15926a9b19e7c7aa0f82cd1
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
index 0b66d6ed33..fd8b4f655e 100644
--- a/modulefiles/ufs_common
+++ b/modulefiles/ufs_common
@@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.10
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
index 3de5bf6ae0..c9a37b491d 100644
--- a/modulefiles/ufs_common_debug
+++ b/modulefiles/ufs_common_debug
@@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.10
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1
diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
index e8970fc42b..f8bac24efa 100644
--- a/modulefiles/ufs_wcoss_cray
+++ b/modulefiles/ufs_wcoss_cray
@@ -49,12 +49,6 @@ module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
-module load sigio/2.3.2
-
-module load upp/10.0.10
-
 ## WCOSS Cray execution prereqs:
 module load rca
 module load alps
diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
index aabcf37682..1589d500f5 100644
--- a/modulefiles/ufs_wcoss_cray_debug
+++ b/modulefiles/ufs_wcoss_cray_debug
@@ -49,12 +49,6 @@ module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
-module load sigio/2.3.2
-
-module load upp/10.0.10
-
 ## WCOSS Cray execution prereqs:
 module load rca
 module load alps