diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
index 70d3c510273..3027875ed7b 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml
@@ -71,6 +71,7 @@ spack:
   - geant4 ~vtk ^[virtuals=qmake] qt
   - geant4 ~vtk ^[virtuals=qmake] qt-base
   #- genie +atmo
+  - geomodel +examples +fullsimlight +geomodelg4 +hepmc3 +pythia +tools +visualization
   - hepmc
   - hepmc3 +interfaces +protobuf +python +rootio
   #- herwig3 +njet +vbfnlo  # Note: herwig3 fails to find evtgen
diff --git a/var/spack/repos/builtin/packages/geomodel/package.py b/var/spack/repos/builtin/packages/geomodel/package.py
index 64cfd2acfca..cdf8ef392fd 100644
--- a/var/spack/repos/builtin/packages/geomodel/package.py
+++ b/var/spack/repos/builtin/packages/geomodel/package.py
@@ -65,7 +65,8 @@ class Geomodel(CMakePackage):
 
     conflicts("+fullsimlight", when="+fsl", msg="FSL triggers the build of the FullSimLight")
 
-    depends_on("cxx", type="build")  # generated
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     depends_on("cmake@3.16:", type="build")
 
@@ -89,7 +90,7 @@ class Geomodel(CMakePackage):
             depends_on("qt-5compat")
         depends_on("coin3d")
         depends_on("soqt")
-        depends_on("opengl")
+        depends_on("gl")
 
     def cmake_args(self):
         args = [
diff --git a/var/spack/repos/builtin/packages/soqt/package.py b/var/spack/repos/builtin/packages/soqt/package.py
index 9c3ed1bc073..dfaccc077a1 100644
--- a/var/spack/repos/builtin/packages/soqt/package.py
+++ b/var/spack/repos/builtin/packages/soqt/package.py
@@ -23,7 +23,8 @@ class Soqt(CMakePackage):
     depends_on("cmake@3:", type="build")
 
     depends_on("coin3d")
-    depends_on("opengl")
+    depends_on("gl")
+    depends_on("glu")
 
     variant(
         "static_defaults",