diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 0ee279aa5820ef66d5dbd741611926339d684dcd..44b01bcc468412f154cba89a7e13f0756806d454 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -367,10 +367,17 @@ packages:
   py-yapf:
     require:
     - '@0.30.0'
+  qmake:
+    require:
+    - qt-base
   qt:
     require:
     - '@5.15.12'
     - +opengl
+  qt-base:
+    require:
+    - '@6.7.2'
+    - +opengl
   root:
     require:
     - '@6.30.02'
diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml
index e3ca54ac3abe2b357489b2620b8b58ff2db3a95c..0076bf660e073b8c34e06dc44e02b2712be4de4a 100644
--- a/spack-environment/xl/spack.yaml
+++ b/spack-environment/xl/spack.yaml
@@ -38,7 +38,7 @@ spack:
   - fmt
   - gaudi
   - gdb
-  - geant4
+  - geant4 +opengl
   - graphviz
   - hepmc3
   - heppdt
diff --git a/spack.sh b/spack.sh
index bc9b232011687daec22d97348b4c089d69633b5a..97e1b4a511649159e718e064704178a6ff1bc85d 100644
--- a/spack.sh
+++ b/spack.sh
@@ -18,6 +18,9 @@ f73d7d2dce226857cbc774e942454bad2992969e
 cbab451c1a342523ed75e9be1098615a597a9b59
 4fe5f35c2fff6288e4c05e5946798ad2191a2c40
 4c60deb9921ff2cbbfa6771f4f63ff812a8a5840
+b894acf1fca8eb5cc52d2267b0c4c187065998c0
+8b45fa089e24c6ab7de2eaf614977369e69daa54
+2d8ca8af6932dfd50204d1e4f6fe587dec7beef5
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -35,3 +38,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## cbab451c1a342523ed75e9be1098615a597a9b59: dd4hep: Add version 1.29
 ## 4fe5f35c2fff6288e4c05e5946798ad2191a2c40: xrootd: add v5.7.0
 ## 4c60deb9921ff2cbbfa6771f4f63ff812a8a5840: xrootd: add github as secondary url to avoid SSL issues
+## b894acf1fca8eb5cc52d2267b0c4c187065998c0: geant4: add v11.2.2, incl g4ndl v4.7.1
+## 8b45fa089e24c6ab7de2eaf614977369e69daa54: geant4: support Qt5 and Qt6
+## 2d8ca8af6932dfd50204d1e4f6fe587dec7beef5: qt-*: add v6.7.1, v6.7.2