diff --git a/env/GAEAC6.env b/env/GAEAC6.env
index a068506b665..9a5c51d3a37 100755
--- a/env/GAEAC6.env
+++ b/env/GAEAC6.env
@@ -9,7 +9,7 @@ fi
 
 step=$1
 
-export launcher="srun -l --export=ALL"
+export launcher="srun -l --export=ALL --distribution=block:block"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
 export OMP_STACKSIZE=2048000
diff --git a/env/URSA.env b/env/URSA.env
index e2a25aaae33..d4dc0161877 100644
--- a/env/URSA.env
+++ b/env/URSA.env
@@ -9,7 +9,7 @@ fi
 
 step=$1
 
-export launcher="srun -l --export=ALL --hint=nomultithread"
+export launcher="srun -l --export=ALL --hint=nomultithread --distribution=block:block"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
 #export POSTAMBLE_CMD='report-mem'
diff --git a/modulefiles/gw_setup.gaeac6.lua b/modulefiles/gw_setup.gaeac6.lua
index dea99e887fa..d3c7be0aa06 100644
--- a/modulefiles/gw_setup.gaeac6.lua
+++ b/modulefiles/gw_setup.gaeac6.lua
@@ -11,9 +11,9 @@ local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 local python_ver=os.getenv("python_ver") or "3.11.7"
 local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 
-load(pathJoin("cmake", cmake_ver))
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("python", python_ver))
+load(pathJoin("cmake", cmake_ver))
 load("py-jinja2")
 load("py-pyyaml")
 load("py-numpy")