diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index 6cf734b91..eef57cecb 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -49,15 +49,12 @@ jobs:
           rm -rf spack
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create gsi-env gsi/ci/spack.yaml
+          spack env create gsi-env gsi/ci/spack_gcc.yaml
           spack env activate gsi-env
           spack compiler find
-          sudo apt install libblas-dev
           spack external find
-          spack add mpich@3.4.2
-          spack add openblas
           spack concretize
-          spack install -v --fail-fast --dirty
+          spack install --fail-fast --dirty
           spack clean -a
 
   gsi:
diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
index 396945309..d8f8c80f5 100644
--- a/.github/workflows/intel.yml
+++ b/.github/workflows/intel.yml
@@ -75,14 +75,12 @@ jobs:
           rm -rf spack
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create gsi-env gsi/ci/spack.yaml
+          spack env create gsi-env gsi/ci/spack_intel.yaml
           spack env activate gsi-env
           spack compiler find
-          sudo apt install cmake
           spack external find
-          spack add intel-oneapi-mpi
           spack concretize
-          spack install -v --fail-fast --dirty
+          spack install --fail-fast --dirty
           spack clean -a
 
   gsi:
diff --git a/ci/spack_gcc.yaml b/ci/spack_gcc.yaml
new file mode 100644
index 000000000..566d47cd7
--- /dev/null
+++ b/ci/spack_gcc.yaml
@@ -0,0 +1,30 @@
+# Spack environment file to build GSI dependencies
+spack:
+  packages:
+    all:
+      providers:
+        blas: openblas
+        lapack: openblas
+        mpi: mpich
+      compiler:
+        - gcc@13
+  specs:
+  - netcdf-c@4.9.2
+  - netcdf-fortran@4.6.1
+  - bufr@11.7.0
+  - bacio@2.4.1
+  - w3emc@2.10.0
+  - sp@2.5.0
+  - ip@4.3.0
+  - sigio@2.3.2
+  - sfcio@1.4.1
+  - nemsio@2.5.4
+  - wrf-io@1.2.0
+  - ncio@1.1.2
+  - crtm@2.4.0.1
+  - gsi-ncdiag@1.1.2
+  - mpich@3.4.2
+  - openblas@0.3.28
+  view: true
+  concretizer:
+    unify: true
diff --git a/ci/spack.yaml b/ci/spack_intel.yaml
similarity index 83%
rename from ci/spack.yaml
rename to ci/spack_intel.yaml
index 48b4c6dbc..cba5974d6 100644
--- a/ci/spack.yaml
+++ b/ci/spack_intel.yaml
@@ -2,9 +2,10 @@
 spack:
   packages:
     all:
+      providers:
+        mpi: intel-oneapi-mpi
       compiler:
         - intel
-        - gcc@13
   specs:
   - netcdf-c@4.9.2
   - netcdf-fortran@4.6.1
@@ -20,6 +21,7 @@ spack:
   - ncio@1.1.2
   - crtm@2.4.0.1
   - gsi-ncdiag@1.1.2
+  - intel-oneapi-mpi@2021.10.0
   view: true
   concretizer:
     unify: true