diff --git a/modulefiles/ufs_s4.intel.lua b/modulefiles/ufs_s4.intel.lua
index 95029242b8..38937d2e4c 100644
--- a/modulefiles/ufs_s4.intel.lua
+++ b/modulefiles/ufs_s4.intel.lua
@@ -1,20 +1,30 @@
-#%Module
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
 
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
-}
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"
+load(pathJoin("miniconda", miniconda3_ver))
 
-module-whatis "loads UFS Model prerequisites for S4"
+license_ver=os.getenv("license_ver") or "S4"
+load(pathJoin("license_intel",license_ver))
 
-module load license_intel/S4
-module use /data/prod/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
-module load hpc-intel/2022.1
-module load hpc-impi/2022.1
 
-module load ufs_common
+prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
 
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform s4.intel
+hpc_ver=os.getenv("hpc_ver") or "1.1.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_impi_ver=os.getenv("hpc_impi_ver") or "2022.1"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "s4.intel")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_s4.intel_debug b/modulefiles/ufs_s4.intel_debug
deleted file mode 100644
index f5b9643d43..0000000000
--- a/modulefiles/ufs_s4.intel_debug
+++ /dev/null
@@ -1,21 +0,0 @@
-#%Module
-
-proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running UFS Model on S4"
-}
-
-module-whatis "loads UFS Model prerequisites for S4"
-
-
-module load license_intel/S4
-module use /data/prod/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
-module load hpc-intel/2022.1
-module load hpc-impi/2022.1
-
-module load ufs_common_debug
-
-setenv CC mpiicc
-setenv CXX mpiicpc
-setenv FC mpiifort
-setenv CMAKE_Platform s4.intel
diff --git a/modulefiles/ufs_s4.intel_debug.lua b/modulefiles/ufs_s4.intel_debug.lua
new file mode 100644
index 0000000000..6286eed5f8
--- /dev/null
+++ b/modulefiles/ufs_s4.intel_debug.lua
@@ -0,0 +1,30 @@
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
+
+miniconda3_ver=os.getenv("miniconda3_ver") or "3.8-s4"
+load(pathJoin("miniconda", miniconda3_ver))
+
+license_ver=os.getenv("license_ver") or "S4"
+load(pathJoin("license_intel",license_ver))
+
+
+prepend_path("MODULEPATH", "/data/prod/hpc-stack/modulefiles/stack")
+
+hpc_ver=os.getenv("hpc_ver") or "1.1.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_impi_ver=os.getenv("hpc_impi_ver") or "2022.1"
+load(pathJoin("hpc-impi", hpc_impi_ver))
+
+load("ufs_common_debug")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "s4.intel")
+
+whatis("Description: UFS build environment")