diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 609eb3ecf51408a29f505570e636d05ca351fb39..5581706be942ef7e735d4aac0c7175bca49b91d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,12 +11,13 @@ variables:
   ## Spack github version
   SPACK_VERSION: "e974b44e8673ded449ce4a3ed5844398b68e81a2"
   ## Space-separated list of spack cherry-picks
-  SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23"
+  SPACK_CHERRYPICKS: "0ab5828d0dfe2182ad108b7e7c56772303065f6e a294acfb73839c9782aff976953a969fb44e161e f181b6fef6da3b576b267799d9c47fa5c8ade67a 5f10562ad13c803bf5d22552a9f07c8c379fdd23 4c0f5f85c0dc27903280ba64d129c2e3d128573d"
   ## 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
 
   ## We need to enable Docker Buildkit to use cache mounts and better
   ## build performance overal
diff --git a/spack.yaml b/spack.yaml
index b5b50486ec7203ef776b4bcae93e873a566e732c..0fa3fd1e82ab1f8d8eae89d3e76d916ada8c2103 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -7,6 +7,7 @@ spack:
     - dawn@3_91a
     - dawncut@1_54a
     - dd4hep@1.20 +geant4 -assimp +hepmc3 +ipo +lcio
+    - edm4hep@0.4 cxxstd=17 -ipo
     - eigen@3.4.0
     - emacs@27.2 toolkit=athena
     - fastjet@3.3.3