diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index 7f36424151636790841535971b9c40309e107ab6..7e3a80b7a60b7f455eb51e39e4331c43341ba707 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -41,6 +41,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked             \
         less                                                            \
         libcbor-xs-perl                                                 \
         libjson-xs-perl                                                 \
+        libopengl0                                                      \
+        libglx0                                                         \
         locales                                                         \
         lua-posix                                                       \
         make                                                            \
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 649fbbd62a928100be099c4dbca1c67374b80276..a54379b4e6b9779737d86e0ce2966ecf15abb1f2 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -57,6 +57,7 @@ RUN declare -A target=(                                                 \
  && target=${target[${TARGETPLATFORM}]}                                 \
  && spack config --scope site add "packages:all:require:[target=${target}]" \
  && spack config --scope site add "packages:all:target:[${target}]"     \
+ && spack external find --scope site llvm                               \
  && spack config blame packages                                         \
  && spack config --scope user add "config:suppress_gpg_warnings:true"   \
  && spack config --scope user add "config:build_jobs:${jobs}"           \
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index 768817c003c4329f0d385859c5f3a4968905d297..6182e8ef0529bc1cea31949370de22ff3e40af8c 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -149,6 +149,9 @@ packages:
   lcov:
     require:
     - '@1.16'
+  libglx:
+    require:
+    - opengl
   lhapdf:
     require:
     - '@6.5.1'
@@ -159,7 +162,7 @@ packages:
   mesa:
     require:
     - '@22.1.6'
-    - +glx -llvm +opengl +opengles +osmesa
+    - +glx +llvm +opengl +opengles +osmesa
   nlohmann-json:
     require:
     - '@3.11.2'
@@ -175,6 +178,10 @@ packages:
     require:
     - '@7.7.1'
     - +application_framework -vtk
+  opengl:
+    externals:
+    - spec: opengl@4.6
+      prefix: /usr
   osg-ca-certs:
     require:
     - '@1.109.igtf.1.117'