diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh
index c969778c12..50979f7dbd 100644
--- a/etc/lmod-setup.sh
+++ b/etc/lmod-setup.sh
@@ -43,11 +43,8 @@ elif [ "$L_MACHINE" = singularity ]; then
    module purge
 
 elif [ "$L_MACHINE" = gaea ]; then
-   export BASH_ENV="/lustre/f2/dev/role.epic/contrib/apps/lmod/lmod/init/bash"
-   source $BASH_ENV
+   source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
 
-   export LMOD_SYSTEM_DEFAULT_MODULES="modules/3.2.11.4"
-   module --initial_load --no_redirect restore
 elif [ "$L_MACHINE" = odin ]; then
    module unload modules
    unset -f module
diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
index 63105d0ab8..4e5cf881bb 100644
--- a/modulefiles/build_gaea_intel.lua
+++ b/modulefiles/build_gaea_intel.lua
@@ -7,7 +7,7 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])
 
 load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
 
-prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0/modulefiles/stack")
+prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0_noarch/modulefiles/stack")
 load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
 load(pathJoin("intel", os.getenv("intel_ver") or "2021.3.0"))
 load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2021.3.0"))