diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index ef77882a..18ce0ac5 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -81,7 +81,7 @@ packages:
     - -shared
   clhep:
     require:
-    - '@2.4.7.1'
+    - '@2.4.7.2'
     - cxxstd=20
   cli11:
     require:
@@ -187,8 +187,8 @@ packages:
       prefix: /opt/software/externals/g4ndl
   geant4:
     require:
-    - '@11.3.2.east'
-    - cxxstd=20 -vecgeom +threads -timemory -vtk
+    - '@11.4.0.east'
+    - cxxstd=20 -vecgeom +threads -vtk
     - any_of: [+opengl +qt +x11, -opengl -qt -x11]
   gettext: 
     require:
diff --git a/spack-environment/packages_cvmfs_geant4data.yaml b/spack-environment/packages_cvmfs_geant4data.yaml
index 865b0b02..b630461f 100644
--- a/spack-environment/packages_cvmfs_geant4data.yaml
+++ b/spack-environment/packages_cvmfs_geant4data.yaml
@@ -9,11 +9,17 @@ packages:
   g4channeling:
     buildable: False
     externals:
+    - spec: g4channeling@2.0
+      prefix: /cvmfs/geant4.cern.ch
     - spec: g4channeling@1.0
       prefix: /cvmfs/geant4.cern.ch
   g4emlow:
     buildable: False
     externals:
+    - spec: g4emlow@8.8
+      prefix: /cvmfs/geant4.cern.ch
+    - spec: g4emlow@8.7
+      prefix: /cvmfs/geant4.cern.ch
     - spec: g4emlow@8.6.1
       prefix: /cvmfs/geant4.cern.ch
   g4ensdfstate:
@@ -24,6 +30,8 @@ packages:
   g4incl:
     buildable: False
     externals:
+    - spec: g4incl@1.3
+      prefix: /cvmfs/geant4.cern.ch
     - spec: g4incl@1.2
       prefix: /cvmfs/geant4.cern.ch
   g4ndl:
@@ -39,11 +47,17 @@ packages:
   g4particlexs:
     buildable: False
     externals:
+    - spec: g4particlexs@4.2
+      prefix: /cvmfs/geant4.cern.ch
     - spec: g4particlexs@4.1
       prefix: /cvmfs/geant4.cern.ch
   g4photonevaporation:
     buildable: False
     externals:
+    - spec: g4photonevaporation@6.1.2
+      prefix: /cvmfs/geant4.cern.ch
+    - spec: g4photonevaporation@6.1.1
+      prefix: /cvmfs/geant4.cern.ch
     - spec: g4photonevaporation@6.1
       prefix: /cvmfs/geant4.cern.ch
   g4pii:
diff --git a/spack-packages.sh b/spack-packages.sh
index a6220f3e..f3b4807c 100644
--- a/spack-packages.sh
+++ b/spack-packages.sh
@@ -39,6 +39,9 @@ b9ad19ee2ce47f8b7fbe187d41d898f873bbc121
 58593e5d028737fef024c8136045b9d3f988e3e3
 e87325e40627e4113c5e374f83e086f2421e005a
 a1437186c1d979ce112d52be178d0fb88b70f332
+bf324ce8df932ae55701fc7e7d46ae835583654f
+d9c75526e8e218806c331d19e5d0a3a5ddc37afb
+bacfc0e267518496447810d77ed2e477ee32f7d5
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -77,3 +80,6 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## 58593e5d028737fef024c8136045b9d3f988e3e3: py-onnxruntime: patch to add linker flag -z noexecstack
 ## e87325e40627e4113c5e374f83e086f2421e005a: acts: add v44.4.0
 ## a1437186c1d979ce112d52be178d0fb88b70f332: acts: narrow when range on podio when +edm4hep +examples
+## bf324ce8df932ae55701fc7e7d46ae835583654f: clhep: use the blessed Gitlab instance instead of proj-clhep.web.cern.ch
+## d9c75526e8e218806c331d19e5d0a3a5ddc37afb: geant4: disable the timemory variant starting with 11.3.0
+## bacfc0e267518496447810d77ed2e477ee32f7d5: geant4: add v11.4.0 and versions of other packages needed