diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f455ec56b5e9335a343286a77e050f80a1e915f..10b53cad917f74d8aa4d79b2125469702c48949e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,17 +8,11 @@ variables:
   EICD_VERSION: "v2.0.0"
   AFTERBURNER_VERSION: "v0.1.2"
 
-  ## Spack github version
-  SPACK_VERSION: "e974b44e8673ded449ce4a3ed5844398b68e81a2"
+  ## Spack github version, v0.18.0
+  SPACK_VERSION: "4c6564f10aa516bc00c1d7dbfdeafe35128985fe"
   ## Space-separated list of spack cherry-picks
-  SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23 4c0f5f85c0dc27903280ba64d129c2e3d128573d 6610c50414cdb451c2073a28ffc4bc3c5fd7b721"
+  SPACK_CHERRYPICKS: ""
   ## Ref: https://github.com/spack/spack/commit/[hash]
-  ## 0ab5828d0dfe2182ad108b7e7c56772303065f6e: gdk-pixbuf: Fix 2.42.2 and add 2.42.6
-  ## a294acfb73839c9782aff976953a969fb44e161e: pythia8: bugfix for pythia8 +fastjet
-  ## f181b6fef6da3b576b267799d9c47fa5c8ade67a: root: depends_on fcgi and re-enabled +http support
-  ## 5f10562ad13c803bf5d22552a9f07c8c379fdd23: [geant4] new version geant4@10.7.3
-  ## 4c0f5f85c0dc27903280ba64d129c2e3d128573d: EDM4hep version 0.4
-  ## 6610c50414cdb451c2073a28ffc4bc3c5fd7b721: madx: new package, versions 5.07.00, 5.08.00, 5.08.01
 
   ## We need to enable Docker Buildkit to use cache mounts and better
   ## build performance overal