diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel
deleted file mode 100644
index d323221d4..000000000
--- a/modulefiles/build.cheyenne.intel
+++ /dev/null
@@ -1,31 +0,0 @@
-#%Module#####################################################
-## Build and run module for Cheyenne
-#############################################################
-
-module purge
-module load ncarenv/1.3
-module load intel/2022.1
-module load mpt/2.25
-module load ncarcompilers/0.5.0
-module load cmake/3.22.0
-
-module use -a /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
-module load hpc/1.2.0
-module load hpc-intel/2022.1
-module load hpc-mpt/2.25
-
-
-module load bacio/2.4.1
-module load g2/3.4.3
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3nco/2.4.1
-module load sigio/2.3.2
-
-module load sfcio/1.4.1
-module load netcdf/4.7.4
-module load esmf/8.3.0b09
-
-setenv CMAKE_C_COMPILER icc
-setenv CMAKE_Fortran_COMPILER ifort
diff --git a/modulefiles/build.cheyenne.intel.lua b/modulefiles/build.cheyenne.intel.lua
new file mode 100644
index 000000000..0c00298d8
--- /dev/null
+++ b/modulefiles/build.cheyenne.intel.lua
@@ -0,0 +1,85 @@
+help([[
+Load environment to compile UFS_UTILS on Cheyenne using Intel
+]])
+
+cmake_ver=os.getenv("cmake_ver") or "3.22.0"
+load(pathJoin("cmake", cmake_ver))
+
+python_ver=os.getenv("python_ver") or "3.7.9"
+load(pathJoin("python", python))
+
+ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
+load(pathJoin("ncarenv", ncarenv_ver))
+
+intel_ver=os.getenv("intel_ver") or "2022.1"
+load(pathJoin("intel", intel_ver))
+
+mpt_ver=os.getenv("mpt_ver") or "2.25"
+load(pathJoin("mpt", mpt_ver))
+
+ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
+load(pathJoin("ncarcompilers", ncarcompilers_ver))
+
+
+unload("netcdf")
+
+
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
+load(pathJoin("hpc", hpc_ver))
+
+hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1"
+load(pathJoin("hpc-intel", hpc_intel_ver))
+
+hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
+load(pathJoin("hpc-mpt", hpc_mpt_ver))
+
+
+-- ??? load("ufs_common")
+
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.4.3"
+load(pathJoin("g2", g2_ver))
+
+ip_ver=os.getenv("ip_ver") or "3.3.3"
+load(pathJoin("ip", ip_ver))
+
+nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
+load(pathJoin("nemsio", nemsio_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.3.3"
+load(pathJoin("sp", sp_ver))
+
+w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
+load(pathJoin("w3nco", w3nco_ver))
+
+sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+load(pathJoin("sigio", sigio_ver))
+
+
+
+sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+load(pathJoin("sfcio", sfcio_ver))
+
+netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+load(pathJoin("netcdf", netcdf_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
+load(pathJoin("esmf", esmf_ver))
+
+setenv("CMAKE_C_COMPILER","icc")
+setenv("CMAKE_Fortran_COMPILER","ifort")
+
+-- From UFS Model build modulefile...
+-- setenv("CC", "mpicc")
+-- setenv("CXX", "mpicxx")
+-- setenv("FC", "mpif90")
+-- setenv("CMAKE_Platform", "cheyenne.intel")
+
+
+whatis("Description: UFS_UTILS build environment")
+