diff --git a/modulefiles/ufs_noaacloud.intel.lua b/modulefiles/ufs_noaacloud.intel.lua
index ef03025c14..658d9a65f0 100644
--- a/modulefiles/ufs_noaacloud.intel.lua
+++ b/modulefiles/ufs_noaacloud.intel.lua
@@ -4,23 +4,27 @@ loads UFS Model prerequisites for NOAA Parallelworks/Intel
 
 prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 prepend_path("MODULEPATH", "/apps/modules/modulefiles")
-prepend_path("PATH", "/contrib/EPIC/bin")
-load("gnu")
-load("stack-intel")
-load("stack-intel-oneapi-mpi")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
+gnu_ver=os.getenv("gnu_ver") or ""
+load(pathJoin("gnu", gnu_ver))
+
+stack_intel_ver=os.getenv("stack_intel_ver") or ""
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
-unload("gnu")
+stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or ""
+load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
+
+gnu_ver=os.getenv("gnu_ver") or ""
+unload(pathJoin("gnu", gnu_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
 
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
 setenv("CC", "mpiicc")
 setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")