diff --git a/.github/ci/spack-envs/clang14_py311_nompi_h5_ad2/spack.yaml b/.github/ci/spack-envs/clang14_py311_nompi_h5_ad2/spack.yaml
index 06e9d1ac40..d06a6e3cae 100644
--- a/.github/ci/spack-envs/clang14_py311_nompi_h5_ad2/spack.yaml
+++ b/.github/ci/spack-envs/clang14_py311_nompi_h5_ad2/spack.yaml
@@ -17,7 +17,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.22.1
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     perl:
       externals:
diff --git a/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2/spack.yaml b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2/spack.yaml
index fa2e588608..ccd5f9dd57 100644
--- a/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2/spack.yaml
+++ b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.23.0
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     openmpi:
       externals:
diff --git a/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2_libcpp/spack.yaml b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2_libcpp/spack.yaml
index 8a8dd00024..da7ec054c7 100644
--- a/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2_libcpp/spack.yaml
+++ b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad2_libcpp/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.23.0
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     openmpi:
       externals:
diff --git a/.github/ci/spack-envs/clang8_py38_mpich_h5_ad2/spack.yaml b/.github/ci/spack-envs/clang8_py38_mpich_h5_ad2/spack.yaml
index a6d568611f..45b794edff 100644
--- a/.github/ci/spack-envs/clang8_py38_mpich_h5_ad2/spack.yaml
+++ b/.github/ci/spack-envs/clang8_py38_mpich_h5_ad2/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.23.0
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     mpich:
       externals:
diff --git a/.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml b/.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml
index 1543ec794c..b585b682be 100644
--- a/.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml
+++ b/.github/ci/spack-envs/clangtidy_nopy_ompi_h5_ad2/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.23.0
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     openmpi:
       externals:
diff --git a/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad2/spack.yaml b/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad2/spack.yaml
index 8785650cf2..2815004df4 100644
--- a/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad2/spack.yaml
+++ b/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad2/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.23.0
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     openmpi:
       externals:
diff --git a/.github/ci/spack-envs/gcc_py_ompi_h5_ad2_arm64/spack.yaml b/.github/ci/spack-envs/gcc_py_ompi_h5_ad2_arm64/spack.yaml
index 7f051faa79..0941ce4f86 100644
--- a/.github/ci/spack-envs/gcc_py_ompi_h5_ad2_arm64/spack.yaml
+++ b/.github/ci/spack-envs/gcc_py_ompi_h5_ad2_arm64/spack.yaml
@@ -16,7 +16,7 @@ spack:
     cmake:
       externals:
       - spec: cmake@3.22.1
-        prefix: /usr
+        prefix: /usr/local
       buildable: False
     libfabric:
       externals:
diff --git a/.github/workflows/dependencies/install_spack b/.github/workflows/dependencies/install_spack
index 30d7d06a92..2376acd981 100755
--- a/.github/workflows/dependencies/install_spack
+++ b/.github/workflows/dependencies/install_spack
@@ -3,7 +3,7 @@
 
 set -eu -o pipefail
 
-spack_ver="0.17.1"
+spack_ver="0.21.1"
 
 cd /opt
 if [[ -d spack && ! -f spack_${spack_ver} ]]
diff --git a/.github/workflows/tooling.yml b/.github/workflows/tooling.yml
index 96a1e5f8fd..0b581e5cc7 100644
--- a/.github/workflows/tooling.yml
+++ b/.github/workflows/tooling.yml
@@ -20,6 +20,9 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install clang clang-tidy gfortran libopenmpi-dev python
+
+        which cmake
+
         sudo .github/workflows/dependencies/install_spack
     - name: Build
       env: {CC: clang, CXX: clang++}