diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b21dcae..1c475b91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - If the ping is not successful, all addresses will be checked again, and the first address to return a successful ping will be cached for 30 seconds
 - Remove requirement to have Jellyfin admin user; user id is no longer required on requests to latest Jellyfin server
 - Upgrade bundled ffmpeg on Windows from 6.1 to 7.1.1
+- Upgrade VAAPI docker image Ubuntu base from 22 to 24; bundled ffmpeg from 6.1 to 7.1.1
 
 ### Fixed
 - Fix error message about synchronizing Plex collections from a Plex server that has zero collections
diff --git a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
index 9445fa40..333a93fa 100644
--- a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
+++ b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
@@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks;
 public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
 {
     private const string BundledVersion = "6.1";
-    private const string BundledVersionVaapi = "6.1";
+    private const string BundledVersionVaapi = "7.1.1";
     private const string WindowsVersionPrefix = "n7.1.1";
 
     private static readonly string[] FFmpegVersionArguments = { "-version" };
diff --git a/docker/vaapi/Dockerfile b/docker/vaapi/Dockerfile
index 26671bf9..cd613ee0 100644
--- a/docker/vaapi/Dockerfile
+++ b/docker/vaapi/Dockerfile
@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-amd64 AS dotnet-runtime
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-amd64 AS dotnet-runtime
 
-FROM jasongdove/ersatztv-ffmpeg:6.1-vaapi AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:7.1.1-vaapi AS runtime-base
 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
 
 # https://hub.docker.com/_/microsoft-dotnet
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-noble-amd64 AS build
 RUN apt-get update && apt-get install -y ca-certificates gnupg
 WORKDIR /source