diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index 4877a854..cf35f4c5 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -67,7 +67,6 @@ jobs:
       - name: install-dependencies-with-spack
         if: steps.cache-env.outputs.cache-hit != 'true'
         run: |
-          sudo apt-get install cmake
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
           spack env create gsiutils-env gsi-utils/ci/spack.yaml
diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
index d87c289c..3f1ca198 100644
--- a/.github/workflows/intel.yml
+++ b/.github/workflows/intel.yml
@@ -13,8 +13,8 @@ env:
   CC: icc
   FC: ifort
   CXX: icpc
-  I_MPI_CC: mpiicc
-  I_MPI_F90: mpiifort
+  I_MPI_CC: icc
+  I_MPI_F90: ifort
 
 # A note on flushing Action cache and relevance to "cache_key" above.
 # There is no way to flush the Action cache, and hence a number (#) is appended
@@ -42,6 +42,7 @@ jobs:
           df -h
           sudo swapoff -a
           sudo rm -rf /swapfile
+          sudo rm -rf /usr_local_mv
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /opt/ghc
           sudo rm -rf "/usr/local/share/boost"
@@ -81,6 +82,8 @@ jobs:
       - name: install-dependencies-with-spack
         if: steps.cache-env.outputs.cache-hit != 'true'
         run: |
+          sudo mv /usr/local/ /usr_local_mv
+          sudo apt-get install cmake
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
           spack env create gsiutils-env gsi-utils/ci/spack.yaml