diff --git a/modulefiles/gsi_orion.lua b/modulefiles/gsi_orion.lua
index 43276b7cbe..a7ea874fb2 100644
--- a/modulefiles/gsi_orion.lua
+++ b/modulefiles/gsi_orion.lua
@@ -1,11 +1,11 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles")
 miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
 load(pathJoin("miniconda3", miniconda3_ver))
 
-prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack")
 
 local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
diff --git a/regression/regression_param.sh b/regression/regression_param.sh
index 79a91bde8e..b017d80c34 100755
--- a/regression/regression_param.sh
+++ b/regression/regression_param.sh
@@ -349,7 +349,7 @@ if [[ "$machine" = "Hera" ]]; then
    export APRUN="srun"
 elif [[ "$machine" = "Orion" ]]; then
    export OMP_STACKSIZE=2048M
-   export APRUN="srun --label -n \$ntasks"
+   export APRUN="srun -n \$ntasks"
 elif [[ "$machine" = "Jet" ]]; then
    export OMP_STACKSIZE=1024M
    export MPI_BUFS_PER_PROC=256
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 8f16306efe..ab92477a56 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -18,7 +18,7 @@ elif [[ $MACHINE_ID = hera* ]] ; then
 elif [[ $MACHINE_ID = orion* ]] ; then
     # We are on Orion
     if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /apps/lmod/init/bash
+        source /apps/lmod/lmod/init/bash
     fi
     module purge
 
@@ -58,7 +58,6 @@ elif [[ $MACHINE_ID = gaea* ]] ; then
         source /etc/profile
         __ms_source_etc_profile=yes
     fi
-    source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
 
     source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh