diff --git a/modulefiles/gfsutils_noaacloud.intel.lua b/modulefiles/gfsutils_noaacloud.intel.lua
index d10ab98f..e44d792b 100644
--- a/modulefiles/gfsutils_noaacloud.intel.lua
+++ b/modulefiles/gfsutils_noaacloud.intel.lua
@@ -2,15 +2,18 @@ help([[
 Build environment for GFS utilities on NOAA Cloud
 ]])
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/modules/modulefiles")
 
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
-local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 
+load("gnu")
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+unload("gnu")
+
 load(pathJoin("cmake", cmake_ver))
 
 load("gfsutils_common")
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 6fd6ee7d..a4635808 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -85,6 +85,11 @@ elif [[ $MACHINE_ID = discover* ]]; then
     export PATH=$PATH:$SPACK_ROOT/bin
     . $SPACK_ROOT/share/spack/setup-env.sh
 
+elif [[ ${MACHINE_ID} = noaacloud ]] ; then
+    # We are on NOAA Cloud
+    module purge
+
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2
+
 fi