diff --git a/.gitmodules b/.gitmodules
index 201bd602..135dac6d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,7 +25,7 @@
 	ignore = all
 [submodule "sorc/gsibec"]
 	path = sorc/gsibec
-	url = https://github.com/GEOS-ESM/GSIbec
+	url = https://github.com/RRFSx/GSIbec
 	branch = develop
 	ignore = all
 [submodule "sorc/ioda"]
@@ -50,12 +50,12 @@
 	ignore = all
 [submodule "sorc/saber"]
 	path = sorc/saber
-	url = https://github.com/jcsda/saber
+	url = https://github.com/RRFSx/saber
 	branch = develop
 	ignore = all
 [submodule "sorc/ufo"]
 	path = sorc/ufo
-	url = https://github.com/jcsda/ufo
+	url = https://github.com/RRFSx/ufo
 	branch = develop
 	ignore = all
 [submodule "sorc/vader"]
@@ -70,7 +70,7 @@
 	ignore = all
 [submodule "sorc/mpas-jedi"]
 	path = sorc/mpas-jedi
-	url = https://github.com/JCSDA/mpas-jedi
+	url = https://github.com/RRFSx/mpas-jedi
 	branch = develop
 	ignore = all
 [submodule "sorc/bufr-query"]
diff --git a/build.sh b/build.sh
index ec34647d..22db1760 100755
--- a/build.sh
+++ b/build.sh
@@ -263,7 +263,7 @@ if [[ $BUILD_RRFS_TEST == 'YES' ]]; then
 fi
 
 # Copy workaround codes (remove these as soon as PRs are merged)
-if [[ $BUILD_WORKAROUND == 'YES' ]]; then
+if [[ $BUILD_WORKAROUND == 'COPY_WORKAROUND' ]]; then
 
   # Apply workaround patches (git commit-base workaround method)
   # Need to convert all the copy-based workaround methods to commit-based method
diff --git a/sorc/gsibec b/sorc/gsibec
index d68bb23d..7b6da879 160000
--- a/sorc/gsibec
+++ b/sorc/gsibec
@@ -1 +1 @@
-Subproject commit d68bb23d885a40492cc5a4435973fb014f07f883
+Subproject commit 7b6da879c1ba18939b5bd36c5ff150e871855616
diff --git a/sorc/mpas-jedi b/sorc/mpas-jedi
index 599ee731..97e3974d 160000
--- a/sorc/mpas-jedi
+++ b/sorc/mpas-jedi
@@ -1 +1 @@
-Subproject commit 599ee731feb559fa5499bff94e0b58c89a3aec8c
+Subproject commit 97e3974d9d5c2b3947d5cb140279d30d63da55e4
diff --git a/sorc/saber b/sorc/saber
index d36b8903..73c92175 160000
--- a/sorc/saber
+++ b/sorc/saber
@@ -1 +1 @@
-Subproject commit d36b8903e1421b21062830a787577dc5301173dc
+Subproject commit 73c921757f58130470e529ac4d59560b708a35f7
diff --git a/sorc/ufo b/sorc/ufo
index af04d3de..bea091d4 160000
--- a/sorc/ufo
+++ b/sorc/ufo
@@ -1 +1 @@
-Subproject commit af04d3de45509228096771ffa6c8532db46628d4
+Subproject commit bea091d48d1899b511259f84bab79723b3fe520f