diff --git a/spack-environment/cuda/spack.yaml b/spack-environment/cuda/spack.yaml
index 450b8705..18fd6915 100644
--- a/spack-environment/cuda/spack.yaml
+++ b/spack-environment/cuda/spack.yaml
@@ -3,8 +3,6 @@ spack:
   - ../concretizer.yaml
   - ../packages.yaml
   - ../view.yaml
-  concretizer:
-    unify: when_possible # multiple epic versions
   specs:
   - acts +cuda cuda_arch=75
   - actsvg
@@ -22,7 +20,6 @@ spack:
   - dawncut
   - dd4hep +ddeve
   - dpmjet
-  - east
   - edm4hep
   - eic-smear
   - eigen
@@ -32,7 +29,7 @@ spack:
   - fmt
   - gaudi
   - gdb
-  - geant4
+  - geant4 +vecgeom
   - graphviz
   - hepmc3
   - heppdt
@@ -93,5 +90,6 @@ spack:
   - spdlog
   - stow
   - valgrind
+  - vecgeom +cuda cuda_arch=75
   - xrootd
   - xeyes
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index d893d0aa..4e365dcd 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -173,8 +173,9 @@ packages:
   geant4:
     require:
     - '@11.3.2.east'
-    - cxxstd=20 -vecgeom +threads -timemory -vtk
-    - any_of: [+opengl +qt +x11, -opengl -qt -x11]
+    - cxxstd=20 +threads -vtk
+    - one_of: [+opengl +qt +x11, -opengl -qt -x11]
+    - one_of: [-vecgeom, +vecgeom]
   gettext: 
     require:
     - +libxml2
@@ -280,7 +281,7 @@ packages:
     require:
     - '@1.4.6'
     - +http
-    - any_of: [+geocad, -geocad]
+    - one_of: [+geocad, -geocad]
   onnx:
     require:
     - '@1.17.0'
@@ -490,7 +491,7 @@ packages:
     require:
     - '@6.36.04'
     - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +vc +x +xrootd +ssl
-    - any_of: [+opengl +webgui, -opengl -webgui]
+    - one_of: [+opengl +webgui, -opengl -webgui]
   sherpa:
     require:
     - '@3.0.1'
@@ -535,6 +536,7 @@ packages:
   vecgeom:
     require:
     - '@1.2.11'
+    - cxxstd=20 +gdml ~geant4 +root
   xerces-c:
     require:
     - cxxstd=20