diff --git a/versions/build.gaea.ver b/versions/build.gaea.ver
index b92fe8c1db..8b6e641eb6 100644
--- a/versions/build.gaea.ver
+++ b/versions/build.gaea.ver
@@ -1,6 +1,5 @@
 export stack_intel_ver=2023.1.0
 export stack_cray_mpich_ver=8.1.25
 export spack_env=gsi-addon-dev
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hera.ver b/versions/build.hera.ver
index 337d5c32da..70afb90a29 100644
--- a/versions/build.hera.ver
+++ b/versions/build.hera.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev-rocky8
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver
index cab0c92111..2d7185d5e7 100644
--- a/versions/build.hercules.ver
+++ b/versions/build.hercules.ver
@@ -2,5 +2,5 @@ export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.jet.ver b/versions/build.jet.ver
index 55c0ea0bd1..e103725d41 100644
--- a/versions/build.jet.ver
+++ b/versions/build.jet.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.noaacloud.ver b/versions/build.noaacloud.ver
index ba47313675..fc288b76b5 100644
--- a/versions/build.noaacloud.ver
+++ b/versions/build.noaacloud.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.3.0
 export stack_impi_ver=2021.3.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
diff --git a/versions/build.orion.ver b/versions/build.orion.ver
index 834ecfc166..29e02f0873 100644
--- a/versions/build.orion.ver
+++ b/versions/build.orion.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export spack_env=gsi-addon-env-rocky9
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
index e2731ccfb3..e2641c124f 100644
--- a/versions/build.s4.ver
+++ b/versions/build.s4.ver
@@ -1,5 +1,5 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.0
 export spack_env=gsi-addon-env
-source "${HOMEgfs:-}/versions/build.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/build.spack.ver b/versions/build.spack.ver
deleted file mode 100644
index 808f85dd16..0000000000
--- a/versions/build.spack.ver
+++ /dev/null
@@ -1,27 +0,0 @@
-export spack_stack_ver=1.6.0
-
-export cmake_ver=3.23.1
-
-export jasper_ver=2.0.32
-export libpng_ver=1.6.37
-export zlib_ver=1.2.13
-export esmf_ver=8.5.0
-export fms_ver=2023.02.01
-
-export hdf5_ver=1.14.0
-export netcdf_c_ver=4.9.2
-export netcdf_fortran_ver=4.6.1
-
-export bacio_ver=2.4.1
-export nemsio_ver=2.5.4
-export sigio_ver=2.3.2
-export w3emc_ver=2.10.0
-export bufr_ver=11.7.0
-export g2_ver=3.4.5
-export sp_ver=2.5.0
-export ip_ver=4.3.0
-export gsi_ncdiag_ver=1.1.2
-export g2tmpl_ver=1.10.2
-export crtm_ver=2.4.0.1
-export wgrib2_ver=2.0.8
-export grib_util_ver=1.3.0
diff --git a/versions/run.gaea.ver b/versions/run.gaea.ver
index c3aceb445d..81aa70df57 100644
--- a/versions/run.gaea.ver
+++ b/versions/run.gaea.ver
@@ -4,5 +4,5 @@ export spack_env=gsi-addon-dev
 
 export perl_ver=5.38.2
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.hera.ver b/versions/run.hera.ver
index 34f81bfe96..6ebc64d9f2 100644
--- a/versions/run.hera.ver
+++ b/versions/run.hera.ver
@@ -9,5 +9,5 @@ export R_ver=3.6.1
 export gempak_ver=7.17.0
 export perl_ver=5.38.0
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver
index ee8e4f8aea..2d7185d5e7 100644
--- a/versions/run.hercules.ver
+++ b/versions/run.hercules.ver
@@ -2,6 +2,5 @@ export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.jet.ver b/versions/run.jet.ver
index 3aa586ee42..1e41fd0036 100644
--- a/versions/run.jet.ver
+++ b/versions/run.jet.ver
@@ -10,5 +10,5 @@ export gempak_ver=7.4.2
 # Adding perl as a module; With Rocky8, perl packages will not be from the OS
 export perl_ver=5.38.0
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
index 4c9ac3cd42..1fc3779b2e 100644
--- a/versions/run.noaacloud.ver
+++ b/versions/run.noaacloud.ver
@@ -2,7 +2,7 @@ export stack_intel_ver=2021.3.0
 export stack_impi_ver=2021.3.0
 export spack_env=gsi-addon-env
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 
 export cdo_ver=2.2.0
diff --git a/versions/run.orion.ver b/versions/run.orion.ver
index 112636fb20..29e02f0873 100644
--- a/versions/run.orion.ver
+++ b/versions/run.orion.ver
@@ -1,6 +1,5 @@
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export spack_env=gsi-addon-env-rocky9
-
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.s4.ver b/versions/run.s4.ver
index 6d0f4cbaca..43e690e19b 100644
--- a/versions/run.s4.ver
+++ b/versions/run.s4.ver
@@ -4,5 +4,5 @@ export spack_env=gsi-addon-env
 
 export ncl_ver=6.4.0-precompiled
 
-source "${HOMEgfs:-}/versions/run.spack.ver"
+source "${HOMEgfs:-}/versions/spack.ver"
 export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.spack.ver b/versions/spack.ver
similarity index 76%
rename from versions/run.spack.ver
rename to versions/spack.ver
index e9af155f13..0e654cb8f8 100644
--- a/versions/run.spack.ver
+++ b/versions/spack.ver
@@ -1,8 +1,12 @@
 export spack_stack_ver=1.6.0
+export cmake_ver=3.23.1
 export python_ver=3.11.6
 
 export jasper_ver=2.0.32
 export libpng_ver=1.6.37
+export zlib_ver=1.2.13
+export esmf_ver=8.5.0
+export fms_ver=2023.02.01
 export cdo_ver=2.2.0
 export nco_ver=5.0.6
 
@@ -10,7 +14,14 @@ export hdf5_ver=1.14.0
 export netcdf_c_ver=4.9.2
 export netcdf_fortran_ver=4.6.1
 
+export bacio_ver=2.4.1
+export nemsio_ver=2.5.4
+export sigio_ver=2.3.2
+export w3emc_ver=2.10.0
 export bufr_ver=11.7.0
+export g2_ver=3.4.5
+export sp_ver=2.5.0
+export ip_ver=4.3.0
 export gsi_ncdiag_ver=1.1.2
 export g2tmpl_ver=1.10.2
 export crtm_ver=2.4.0.1