diff --git a/modulefiles/module_base.orion b/modulefiles/module_base.orion
index 0a39dd6ce9..facf50d400 100755
--- a/modulefiles/module_base.orion
+++ b/modulefiles/module_base.orion
@@ -31,7 +31,7 @@ module load esmflocal/8.0.1.08bs
 module load post-intel-sandybridge/8.0.5
 
 module load contrib
-module load rocoto/1.3.1
+module load rocoto/1.3.2
 module load slurm/19.05.3-2
 
 # Python
diff --git a/sorc/build_ufs_utils.sh b/sorc/build_ufs_utils.sh
index b42c42b182..292145d764 100755
--- a/sorc/build_ufs_utils.sh
+++ b/sorc/build_ufs_utils.sh
@@ -7,13 +7,9 @@ cwd=`pwd`
 if [ $target = wcoss_dell_p3 ]; then target=dell; fi
 if [ $target = wcoss_cray ]; then target=cray; fi
 
-cd ufs_utils.fd
+cd ufs_utils.fd/sorc
 
-./build_all.sh
-
-cd fix
-
-./link_fixdirs.sh emc $target
+./build_all_ufs_utils.sh
 
 exit
 
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index cf323d7c49..9f034683bc 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -33,8 +33,7 @@ if [[ ! -d gldas.fd ]] ; then
     rm -f ${topdir}/checkout-gldas.log
     git clone https://github.com/NOAA-EMC/GLDAS.git gldas.fd >> ${topdir}/checkout-gldas.fd.log 2>&1
     cd gldas.fd
-    #git checkout gldas_gfsv16_release.v1.3.0
-    git checkout feature/orion_port
+    git checkout gldas_gfsv16_release.v1.3.0
     cd ${topdir}
 else
     echo 'Skip.  Directory gldas.fd already exists.'
@@ -46,8 +45,7 @@ if [[ ! -d ufs_utils.fd ]] ; then
     #git clone https://github.com/NOAA-EMC/UFS_UTILS.git ufs_utils.fd >> ${topdir}/checkout-ufs_utils.fd.log 2>&1
     git clone --recursive https://github.com/GeorgeGayno-NOAA/UFS_UTILS.git ufs_utils.fd >> ${topdir}/checkout-ufs_utils.fd.log 2>&1
     cd ufs_utils.fd
-    #git checkout release/ops-gfsv16 
-    git checkout feature/orion
+    git checkout release/ops-gfsv16 
     cd ${topdir}
 else
     echo 'Skip.  Directory ufs_utils.fd already exists.'
diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
index ec14923c65..766abb0a11 100755
--- a/sorc/link_fv3gfs.sh
+++ b/sorc/link_fv3gfs.sh
@@ -45,6 +45,10 @@ for dir in fix_am fix_chem fix_fv3 fix_fv3_gmted2010 fix_gldas fix_orog fix_sfc_
 done
 $LINK $FIX_DIR/* .
 
+if [ -d ${pwd}/ufs_utils.fd ]; then 
+  cd ${pwd}/ufs_utils.fd/sorc
+  ./link_fixdirs.sh $RUN_ENVIR $machine
+fi
 
 #---------------------------------------
 #--add files from external repositories