diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index 02533d4ea1..94168728f9 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -113,7 +113,7 @@ if [[ ! -d verif-global.fd ]] ; then
     rm -f ${topdir}/checkout-verif-global.log
     git clone --recursive https://github.com/NOAA-EMC/EMC_verif-global.git verif-global.fd >> ${topdir}/checkout-verif-global.log 2>&1
     cd verif-global.fd
-    git checkout verif_global_v2.0.2
+    git checkout verif_global_v2.2.1
     cd ${topdir}
 else
     echo 'Skip. Directory verif-global.fd already exist.'
diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
index 293d18c101..4ab8fb62e9 100755
--- a/ush/rocoto/setup_expt.py
+++ b/ush/rocoto/setup_expt.py
@@ -239,7 +239,7 @@ def edit_baseconfig():
     elif machine == 'ORION':
       base_git = '/work/noaa/global/glopara/git'
       base_svn = '/work/noaa/global/glopara/svn'
-      dmpdir = '/work/noaa/global/glopara/dump'
+      dmpdir = '/work/noaa/rstprod/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
       comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'
@@ -250,8 +250,8 @@ def edit_baseconfig():
       queue = 'batch'
       queue_service = 'service'
       partition_batch = 'orion'
-      chgrp_rstprod = 'NO'
-      chgrp_cmd = 'ls'
+      chgrp_rstprod = 'YES'
+      chgrp_cmd = 'chgrp rstprod'
       hpssarch = 'NO'
 
     if args.icsdir is not None and not os.path.exists(icsdir):
diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
index 3e7397127d..3e186fd1d9 100755
--- a/ush/rocoto/setup_expt_fcstonly.py
+++ b/ush/rocoto/setup_expt_fcstonly.py
@@ -227,7 +227,7 @@ def edit_baseconfig():
     elif machine == 'ORION':
       base_git = '/work/noaa/global/glopara/git'
       base_svn = '/work/noaa/global/glopara/svn'
-      dmpdir = '/work/noaa/global/glopara/dump'
+      dmpdir = '/work/noaa/rstprod/dump'
       nwprod = '/work/noaa/global/glopara/nwpara'
       comroot = '/work/noaa/global/glopara/com'
       homedir = '/work/noaa/global/$USER'
@@ -238,8 +238,8 @@ def edit_baseconfig():
       queue = 'batch'
       queue_service = 'service'
       partition_batch = 'orion'
-      chgrp_rstprod = 'NO'          # No rstprod on Orion
-      chgrp_cmd = 'ls'
+      chgrp_rstprod = 'YES'
+      chgrp_cmd = 'chgrp rstprod'
       hpssarch = 'NO'
 
     # COMROT directory