diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index ca5e6ef93d4..869f00a00d5 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -192,7 +192,6 @@ debian-build-x86_64:
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gallium-rusticl=false
       -D legacy-wayland=bind-wayland-display
@@ -225,7 +224,6 @@ debian-release:
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gallium-rusticl=false
       -D llvm=enabled
@@ -265,7 +263,6 @@ alpine-build-testing:
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=disabled
       -D gallium-va=enabled
       -D gallium-rusticl=false
       -D gles1=disabled
@@ -315,7 +312,6 @@ fedora-release:
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gallium-rusticl=true
       -D gles1=disabled
@@ -366,7 +362,6 @@ debian-android:
       -D mesa-clc=system
       -D precomp-compiler=system
     GALLIUM_ST: >
-      -D gallium-vdpau=disabled
       -D gallium-va=disabled
       -D gallium-rusticl=false
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
@@ -414,7 +409,6 @@ debian-android:
       -D egl=enabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
-      -D gallium-vdpau=disabled
       -D gallium-va=disabled
 
 .meson-arm:
@@ -627,7 +621,6 @@ debian-clang:
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gles1=enabled
       -D gles2=enabled
@@ -676,7 +669,6 @@ debian-clang-release:
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D gallium-extra-hud=true
-      -D gallium-vdpau=enabled
       -D gallium-va=enabled
       -D gles1=disabled
       -D gles2=disabled
@@ -714,7 +706,6 @@ debian-vulkan:
       -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
-      -D gallium-vdpau=disabled
       -D gallium-va=disabled
       -D gallium-rusticl=false
       -D b_sanitize=undefined
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index 38e6257428b..331e419fb91 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -55,7 +55,6 @@ DEPS=(
     libpciaccess-dev
     libunwind-dev
     libva-dev
-    libvdpau-dev
     libvulkan-dev
     libx11-dev
     libx11-xcb-dev
diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
index 6749a52df58..0b533fd02ca 100644
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -51,7 +51,6 @@ DEPS=(
     "pkgconfig(libglvnd)"
     "pkgconfig(libva)"
     "pkgconfig(pciaccess)"
-    "pkgconfig(vdpau)"
     "pkgconfig(vulkan)"
     "pkgconfig(x11)"
     "pkgconfig(x11-xcb)"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index b6c5198f43b..2b37ca10684 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -32,7 +32,7 @@ variables:
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
   ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250813-fluster"
 
-  FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"
+  FEDORA_X86_64_BUILD_TAG: "20250811-vdpau"
 
   KERNEL_TAG: "v6.16-mesa-9d85"
   KERNEL_REPO: "gfx-ci/linux"