diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index d19f9a9994732184bf4c23de159e1fc264fea4e6..1694a51a977779bfb8531ce3fadbce88acd83b14 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -41,6 +41,8 @@ apt-get -yqq install --no-install-recommends                            \
         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 2f4a13dac17883f21442374a7f84b5a8ef4a7bdb..d9095337749f195338686698f9cb1e4755d5fff5 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -50,6 +50,7 @@ declare -A target=(["linux/amd64"]="x86_64_v2" ["linux/arm64"]="aarch64")
 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'