diff --git a/modulefiles/gsiutils_orion.intel.lua b/modulefiles/gsiutils_orion.intel.lua
index 9f54b361..43190cad 100644
--- a/modulefiles/gsiutils_orion.intel.lua
+++ b/modulefiles/gsiutils_orion.intel.lua
@@ -1,11 +1,16 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+-- Spack Stack installation specs
+local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
+local ss_ver=os.getenv("stack_ver") or "1.6.0"
+local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
+
+prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
 
 local stack_python_ver=os.getenv("python_ver") or "3.11.6"
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index 683ee0db..b049a604 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,8 +75,8 @@ elif [[ -d /scratch1 ]]; then
   MACHINE_ID=hera
 elif [[ -d /work ]]; then
   # We are on MSU Orion or Hercules
-  if [[ -d /apps/other ]]; then
-    # We are on Hercules
+  mount=$(findmnt -n -o SOURCE /home)
+  if [[ ${mount} =~ "hercules" ]]; then
     MACHINE_ID=hercules
   else
     MACHINE_ID=orion