diff --git a/modulefiles/hera.lua b/modulefiles/hera.lua
index 5bd691da6..2231ad1c1 100644
--- a/modulefiles/hera.lua
+++ b/modulefiles/hera.lua
@@ -3,7 +3,7 @@ Load environment to build UPP on hera
 ]])
 
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))
diff --git a/modulefiles/hera_c.lua b/modulefiles/hera_c.lua
new file mode 100644
index 000000000..5bd691da6
--- /dev/null
+++ b/modulefiles/hera_c.lua
@@ -0,0 +1,23 @@
+help([[
+Load environment to build UPP on hera
+]])
+
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
+whatis("Description: UPP build environment")
diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua
index dcd54d7b5..a118c88aa 100644
--- a/modulefiles/jet.lua
+++ b/modulefiles/jet.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to build UPP on Jet
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))
diff --git a/modulefiles/jet_c.lua b/modulefiles/jet_c.lua
new file mode 100644
index 000000000..dcd54d7b5
--- /dev/null
+++ b/modulefiles/jet_c.lua
@@ -0,0 +1,22 @@
+help([[
+Load environment to build UPP on Jet
+]])
+
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
+whatis("Description: UPP build environment")
diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
index 997e550dc..cbc6a96bc 100755
--- a/tests/detect_machine.sh
+++ b/tests/detect_machine.sh
@@ -44,23 +44,23 @@ case $(hostname -f) in
 
   gaea5[0-9]*)             MACHINE_ID=gaea-c5 ;; ### GAEA C5 login node
 
-  hfe01)                   MACHINE_ID=hera ;; ### hera01
-  hfe02)                   MACHINE_ID=hera ;; ### hera02
-  hfe03)                   MACHINE_ID=hera ;; ### hera03
-  hfe04)                   MACHINE_ID=hera ;; ### hera04
-  hfe05)                   MACHINE_ID=hera ;; ### hera05
-  hfe06)                   MACHINE_ID=hera ;; ### hera06
-  hfe07)                   MACHINE_ID=hera ;; ### hera07
-  hfe08)                   MACHINE_ID=hera ;; ### hera08
+  hfe01)                   MACHINE_ID=hera_c ;; ### hera01
+  hfe02)                   MACHINE_ID=hera_c ;; ### hera02
+  hfe03)                   MACHINE_ID=hera_c ;; ### hera03
+  hfe04)                   MACHINE_ID=hera_c ;; ### hera04
+  hfe05)                   MACHINE_ID=hera_c ;; ### hera05
+  hfe06)                   MACHINE_ID=hera_c ;; ### hera06
+  hfe07)                   MACHINE_ID=hera_c ;; ### hera07
+  hfe08)                   MACHINE_ID=hera_c ;; ### hera08
   hfe09)                   MACHINE_ID=hera ;; ### hera09
   hfe10)                   MACHINE_ID=hera ;; ### hera10
   hfe11)                   MACHINE_ID=hera ;; ### hera11
   hfe12)                   MACHINE_ID=hera ;; ### hera12
 
-  fe1)                     MACHINE_ID=jet ;; ### jet01
-  fe2)                     MACHINE_ID=jet ;; ### jet02
-  fe3)                     MACHINE_ID=jet ;; ### jet03
-  fe4)                     MACHINE_ID=jet ;; ### jet04
+  fe1)                     MACHINE_ID=jet_c ;; ### jet01
+  fe2)                     MACHINE_ID=jet_c ;; ### jet02
+  fe3)                     MACHINE_ID=jet_c ;; ### jet03
+  fe4)                     MACHINE_ID=jet_c ;; ### jet04
   fe5)                     MACHINE_ID=jet ;; ### jet05
   fe6)                     MACHINE_ID=jet ;; ### jet06
   fe7)                     MACHINE_ID=jet ;; ### jet07