diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
index 4d747512db..87abcc7233 100644
--- a/modulefiles/module_base.orion.lua
+++ b/modulefiles/module_base.orion.lua
@@ -9,8 +9,7 @@ load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
 load(pathJoin("python", (os.getenv("python_ver") or "None")))
 
-load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
-load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
+--load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
 load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
 load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
index 0cdc279526..02ce084c24 160000
--- a/sorc/gfs_utils.fd
+++ b/sorc/gfs_utils.fd
@@ -1 +1 @@
-Subproject commit 0cdc2795260fc1b59e86a873729433a470794a97
+Subproject commit 02ce084c244823e22661d493a50236b7d5eaf70a
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
index 8e279f9c73..529bb796be 160000
--- a/sorc/gsi_enkf.fd
+++ b/sorc/gsi_enkf.fd
@@ -1 +1 @@
-Subproject commit 8e279f9c734097f673b07e80f385b2623d13ba4a
+Subproject commit 529bb796bea0e490f186729cd168a91c034bb12d
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
index f9d6f5f744..e1f9f21af1 160000
--- a/sorc/gsi_monitor.fd
+++ b/sorc/gsi_monitor.fd
@@ -1 +1 @@
-Subproject commit f9d6f5f744462a449e70abed8c5860b1c4564ad8
+Subproject commit e1f9f21af16ce912fdc2cd75c5b27094a550a0c5
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
index 4332814529..9382fd01c2 160000
--- a/sorc/gsi_utils.fd
+++ b/sorc/gsi_utils.fd
@@ -1 +1 @@
-Subproject commit 4332814529465ab8eb58e43a38227b952ebfca49
+Subproject commit 9382fd01c2a626c8934c3f553d420a45de2b4dec
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index 2794d413d0..3ef2e6bd72 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit 2794d413d083b43d9ba37a15375d5c61b610d29e
+Subproject commit 3ef2e6bd725d2662fd6ee95897cb7bac222e5144
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index cfd0fa97e2..b049a6040e 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -45,7 +45,7 @@ case $(hostname -f) in
   *) MACHINE_ID=UNKNOWN ;;  # Unknown platform
 esac
 
-if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then 
+if [[ ${MACHINE_ID} == "UNKNOWN" ]]; then
    case ${PW_CSP:-} in
       "aws" | "google" | "azure") MACHINE_ID=noaacloud ;;
       *) PW_CSP="UNKNOWN"
@@ -75,7 +75,7 @@ elif [[ -d /scratch1 ]]; then
   MACHINE_ID=hera
 elif [[ -d /work ]]; then
   # We are on MSU Orion or Hercules
-  mount=$(findmnt -n -o SOURCE /home)   
+  mount=$(findmnt -n -o SOURCE /home)
   if [[ ${mount} =~ "hercules" ]]; then
     MACHINE_ID=hercules
   else
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
index df7856110d..834ecfc166 100644
--- a/versions/build.orion.ver
+++ b/versions/build.orion.ver
@@ -1,5 +1,5 @@
-export stack_intel_ver=2022.0.2
-export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-env
+export stack_intel_ver=2021.9.0
+export stack_impi_ver=2021.9.0
+export spack_env=gsi-addon-env-rocky9
 source "${HOMEgfs:-}/versions/build.spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
index 2fdeae8888..9c3444d5c0 100644
--- a/versions/run.orion.ver
+++ b/versions/run.orion.ver
@@ -1,12 +1,8 @@
-export stack_intel_ver=2022.0.2
-export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-env
+export stack_intel_ver=2021.9.0
+export stack_impi_ver=2021.9.0
+export spack_env=gsi-addon-env-rocky9
 
-export ncl_ver=6.6.2
-export gempak_ver=7.5.1
+export gempak_ver=7.5.1  # TODO: this version is not installed on Orion+Rocky9
 
 source "${HOMEgfs:-}/versions/run.spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
-
-#cdo is older on Orion
-export cdo_ver=2.0.5