diff --git a/eic-spack.sh b/eic-spack.sh
index ae2c5d5b..db341272 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -5,4 +5,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack commit hash or github version, e.g. v0.19.7
 ## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="9cb75284f136ce8cf9bc54fe5b979e40e6eba485"
+EICSPACK_VERSION="3f8e52f5790f29576b5a4699c3e7ae16d351b4d7"
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 97da78b7..fbb65382 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -126,7 +126,7 @@ packages:
   dd4hep:
     require:
     - '@1.36'
-    - +ddg4 +ddcad +edm4hep +hepmc3 +xercesc
+    - +ddg4 +ddcad +edm4hep +g4hepem +hepmc3 +xercesc
     - any_of: [+ddeve +utilityapps, -ddeve -utilityapps] # FIXME ^root +x +opengl when +utilityapps
   doxygen:
     require:
@@ -329,7 +329,7 @@ packages:
     - '@0.0.3'
   npsim:
     require:
-    - '@1.6.0'
+    - '@git.g4hepem'
     - +http
     - any_of: [+geocad, -geocad]
   ollama: