diff --git a/.gitmodules b/.gitmodules
index ea1b5c06af..1c3b7acfa5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,10 +26,6 @@
 [submodule "sorc/gsi_monitor.fd"]
   path = sorc/gsi_monitor.fd
   url = https://github.com/NOAA-EMC/GSI-Monitor.git
-[submodule "sorc/upp.fd"]
-  path = sorc/upp.fd
-  url = https://github.com/NOAA-EMC/UPP.git
-  ignore = dirty
 [submodule "sorc/jcb"]
   path = sorc/jcb
   url = https://github.com/noaa-emc/jcb
diff --git a/sorc/build_upp.sh b/sorc/build_upp.sh
index 1dca0035fd..e217e171db 100755
--- a/sorc/build_upp.sh
+++ b/sorc/build_upp.sh
@@ -26,6 +26,6 @@ if [[ ! -d "../exec" ]]; then
   mkdir -p ../exec
 fi
 
-cd upp.fd/tests
+cd ufs_model.fd/FV3/upp/tests
 # shellcheck disable=SC2086
 BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index 68873d0f1a..36ab46e122 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -362,11 +362,10 @@ fi
 #--link source code directories
 #------------------------------
 cd "${HOMEgfs}/sorc" || exit 8
-# TODO: Commenting out until UPP is up-to-date with Rocky-8.
-#if [[ -d ufs_model.fd ]]; then
-#  [[ -d upp.fd ]] && rm -rf upp.fd
-#  ${LINK} ufs_model.fd/FV3/upp upp.fd
-#fi
+if [[ -d ufs_model.fd ]]; then
+  [[ -d upp.fd ]] && rm -rf upp.fd
+  ${LINK} ufs_model.fd/FV3/upp upp.fd
+fi
 
 if [[ -d gsi_enkf.fd ]]; then
   [[ -d gsi.fd ]] && rm -rf gsi.fd
diff --git a/sorc/upp.fd b/sorc/upp.fd
deleted file mode 160000
index 83e83a938b..0000000000
--- a/sorc/upp.fd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 83e83a938b5794a628d30e66a54902dabe58737d