diff --git a/tools/spack/cp2k_deps_all.yaml b/tools/spack/cp2k_deps_all.yaml
index b9a0be0071..e117a0ea4a 100644
--- a/tools/spack/cp2k_deps_all.yaml
+++ b/tools/spack/cp2k_deps_all.yaml
@@ -102,7 +102,8 @@ spack:
     - "libsmeagol@1.2"
     - "libvori@220621"
     - "libxc@7.0.0"
-    - "libxsmm@main-2024-09"
+#   - "libxsmm@main-2024-09" Use 1.17 with Spack as long as grid unit tests fail
+    - "libxsmm@1.17"
     - "plumed@2.9.2"
     - "py-torch@2.6"
     - "sirius@7.6.1"
diff --git a/tools/spack/cp2k_deps_minimal.yaml b/tools/spack/cp2k_deps_minimal.yaml
index c1570cb3a7..b1e28b0605 100644
--- a/tools/spack/cp2k_deps_minimal.yaml
+++ b/tools/spack/cp2k_deps_minimal.yaml
@@ -46,7 +46,8 @@ spack:
     - "netlib-scalapack@2.2.2"
     - "dbcsr@2.8.0"
     - "fftw@3.3.10"
-    - "libxsmm@main-2024-09"
+#   - "libxsmm@main-2024-09" Use 1.17 with Spack as long as grid unit tests fail
+    - "libxsmm@1.17"
   view:
     default:
       root: ./spack-env/view