diff --git a/modulefiles/s4 b/modulefiles/s4
deleted file mode 100644
index f41835c42..000000000
--- a/modulefiles/s4
+++ /dev/null
@@ -1,33 +0,0 @@
-#%Module######################################################################
-# David Huber 06/2021, Set up config. with the hpc-stack NCEPLIBS. 
-##############################################################################
-
-proc ModulesHelp { } {
-puts stderr "Loads modules required for building upp"
-}
-module-whatis "Loads UPP prerequisites on S4"
-
-module load license_intel/S4
-module use /data/prod/hpc-stack/modulefiles/stack
-module load hpc/1.1.0
-module load hpc-intel/18.0.4
-module load hpc-impi/18.0.4
-
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.10.0
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sfcio/1.4.1
-module load sigio/2.3.2
-module load sp/2.3.3
-module load w3emc/2.9.2
-module load wrf_io/1.1.1
diff --git a/modulefiles/s4.lua b/modulefiles/s4.lua
new file mode 100644
index 000000000..3a42fa888
--- /dev/null
+++ b/modulefiles/s4.lua
@@ -0,0 +1,24 @@
+-- ---------------------------------------------------------------------------
+-- David Huber 06/2021, Set up config. with the hpc-stack NCEPLIBS.
+-- Innocent Souopgui 11/2023, Update to use spack-stack
+-- ---------------------------------------------------------------------------
+
+
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
+whatis("Description: UPP build environment")
+