diff --git a/Dockerfile.win64.make b/Dockerfile.win64.make
index eb2319d2d..3d7382b33 100644
--- a/Dockerfile.win64.make
+++ b/Dockerfile.win64.make
@@ -1,5 +1,5 @@
 #!/usr/bin/make
-DISTRO=ubuntu:hirsute
+DISTRO=ubuntu:lunar
 .PHONY: Dockerfile
 Dockerfile: Dockerfile.win64.in
 	sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@
diff --git a/build-windows-win64 b/build-windows-win64
index 7843510a5..60ebade28 100755
--- a/build-windows-win64
+++ b/build-windows-win64
@@ -9,7 +9,7 @@ for dep in docker make; do
 done
 
 # Use the latest distro for toolchains
-distro="ubuntu:kinetic"
+distro="ubuntu:lunar"
 image_name="jellyfin-ffmpeg-build-windows-win64"
 package_temporary_dir="$( mktemp -d )"
 current_user="$( whoami )"
diff --git a/docker-build.sh b/docker-build.sh
index f12024ef0..35f560aae 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -376,7 +376,7 @@ prepare_extra_amd64() {
         pushd ${SOURCE_DIR}
         git clone https://gitlab.freedesktop.org/mesa/mesa.git
         pushd mesa
-        git reset --hard "f39ffc69"
+        git reset --hard "5e9ea154"
         popd
         # disable the broken hevc packed header
         MESA_VA_PIC="mesa/src/gallium/frontends/va/picture.c"