diff --git a/firefox.yaml b/firefox.yaml
index a15d8c1ca6a..422bbbeb38e 100644
--- a/firefox.yaml
+++ b/firefox.yaml
@@ -1,7 +1,7 @@
 package:
   name: firefox
   version: 132.0.1
-  epoch: 0
+  epoch: 1
   description: Firefox web browser
   copyright:
     - license: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0
@@ -10,7 +10,8 @@ package:
     no-provides: true
   dependencies:
     runtime:
-      - mesa-gl
+      - mesa
+      - mesa-glx
       - pciutils-libs
 
 vars:
diff --git a/glew.yaml b/glew.yaml
index 5d61065804c..e630e6169a7 100644
--- a/glew.yaml
+++ b/glew.yaml
@@ -1,7 +1,7 @@
 package:
   name: glew
   version: 2.2.0
-  epoch: 1
+  epoch: 2
   description: "A cross-platform C/C++ extension loading library"
   copyright:
     - license: GPL-2.0-or-later
@@ -17,7 +17,7 @@ environment:
       - libxi-dev
       - libxmu-dev
       - mesa-dev
-      - mesa-gl
+      - mesa-glx
       - mesa-libgallium
       - openssf-compiler-options
       - wolfi-base
diff --git a/gst-plugins-bad.yaml b/gst-plugins-bad.yaml
index f72f42a3114..bdf33927759 100644
--- a/gst-plugins-bad.yaml
+++ b/gst-plugins-bad.yaml
@@ -1,7 +1,7 @@
 package:
   name: gst-plugins-bad
   version: 1.24.9
-  epoch: 0
+  epoch: 1
   description: GStreamer streaming media framework bad plug-ins
   copyright:
     - license: GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -34,9 +34,8 @@ environment:
       - libxv-dev
       - mesa-dev
       - mesa-gbm
-      - mesa-gl
       - mesa-glapi
-      - mesa-gles
+      - mesa-glx
       - mesa-libgallium
       - meson
       - openssf-compiler-options
diff --git a/gst-plugins-base.yaml b/gst-plugins-base.yaml
index 06f1d591007..8914c2d4381 100644
--- a/gst-plugins-base.yaml
+++ b/gst-plugins-base.yaml
@@ -1,7 +1,7 @@
 package:
   name: gst-plugins-base
   version: 1.24.9
-  epoch: 0
+  epoch: 2
   description: GStreamer streaming media framework base plug-ins
   copyright:
     - license: GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -34,9 +34,8 @@ environment:
       - mesa-dev
       - mesa-egl
       - mesa-gbm
-      - mesa-gl
       - mesa-glapi
-      - mesa-gles
+      - mesa-glx
       - mesa-libgallium
       - meson
       - openssf-compiler-options
diff --git a/mesa.yaml b/mesa.yaml
index d16dfca562c..49d140b4aa1 100644
--- a/mesa.yaml
+++ b/mesa.yaml
@@ -1,10 +1,13 @@
 package:
   name: mesa
   version: 24.2.6
-  epoch: 1
+  epoch: 2
   description: Mesa DRI OpenGL library
   copyright:
     - license: MIT AND SGI-B-2.0 AND BSL-1.0
+  dependencies:
+    runtime:
+      - libglvnd
 
 vars:
   llvm-ver: 19
@@ -25,6 +28,7 @@ environment:
       - gettext
       - glslang-dev
       - libdrm-dev
+      - libglvnd-dev
       - libtool
       - libva
       - libva-dev
@@ -84,6 +88,7 @@ pipeline:
         -Dvulkan-layers=$_vulkan_layers \
         -Dplatforms=x11,wayland \
         -Dllvm=enabled \
+        -Dglvnd=true \
         -Dshared-llvm=enabled \
         -Dshared-glapi=enabled \
         -Dgbm=enabled \
@@ -113,9 +118,8 @@ pipeline:
 data:
   - name: libs
     items:
-      gles: libGLES*
-      egl: libEGL
-      gl: libGL
+      egl: libEGL_mesa
+      glx: libGLX_mesa
       glapi: libglapi
       xatracker: libxatracker*
       osmesa: libOSMesa
@@ -123,18 +127,37 @@ data:
       libd3dadapter9: d3d/d3dadapter9
       libgallium: libgallium-${{package.version}}
 
+  - name: transitive
+    items:
+      gl: ""
+      gles: ""
+
 subpackages:
   - range: libs
     name: mesa-${{range.key}}
     description: mesa ${{range.key}}
+    dependencies:
+      runtime:
+        - libglvnd
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/lib
           mv ${{targets.destdir}}/usr/lib/${{range.value}}.so* ${{targets.subpkgdir}}/usr/lib
 
+  - range: transitive
+    name: mesa-${{range.key}}
+    description: mesa transitive package for ${{range.key}}
+    dependencies:
+      runtime:
+        - mesa
+        - mesa-glx
+
   - name: mesa-dev
     pipeline:
       - uses: split/dev
+    dependencies:
+      runtime:
+        - libglvnd-dev
     description: mesa dev
     test:
       pipeline:
@@ -145,12 +168,12 @@ test:
     contents:
       packages:
         - gcc
+        - libglvnd-dev
         - libx11-dev
         - libxext-dev
-        - mesa-dev
+        - mesa
         - wget
         - glibc-dev
-        - mesa-gl
   pipeline:
     - name: Compile and run glxgears
       runs: |
diff --git a/qt5-qtbase.yaml b/qt5-qtbase.yaml
index e521939ae9c..5c3a923ba44 100644
--- a/qt5-qtbase.yaml
+++ b/qt5-qtbase.yaml
@@ -2,7 +2,7 @@
 package:
   name: qt5-qtbase
   version: 5.15.15
-  epoch: 3
+  epoch: 4
   description: Qt5 - QtBase components
   copyright:
     - license: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -48,8 +48,7 @@ environment:
       - mesa
       - mesa-dev
       - mesa-egl
-      - mesa-gl
-      - mesa-gles
+      - mesa-glx
       - mtdev-dev
       - openssf-compiler-options
       - openssh-client
diff --git a/qt6-qtbase.yaml b/qt6-qtbase.yaml
index 3cd3bb3fb13..5f73eb4f190 100644
--- a/qt6-qtbase.yaml
+++ b/qt6-qtbase.yaml
@@ -3,7 +3,7 @@
 package:
   name: qt6-qtbase
   version: 6.8.0
-  epoch: 2
+  epoch: 3
   description: qt
   copyright:
     - license: LGPL-3.0-or-later
@@ -43,8 +43,7 @@ environment:
       - mesa
       - mesa-dev
       - mesa-egl
-      - mesa-gl
-      - mesa-gles
+      - mesa-glx
       - nodejs
       - openssf-compiler-options
       - perl