diff --git a/Dockerfile b/Dockerfile
index bd81585..5bbce31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,6 @@ LABEL maintainer="thelamer"
 ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
-# set Intel iHD driver versions
-# https://dgpu-docs.intel.com/releases/index.html
-ARG INTEL_LIBVA_VER="2.13.0+i643~u20.04"
-ARG INTEL_GMM_VER="21.3.3+i643~u20.04"
-ARG INTEL_iHD_VER="21.4.1+i643~u20.04"
-
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
@@ -25,8 +19,6 @@ RUN \
   echo "**** install jellyfin *****" && \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
   echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
-  curl -s https://repositories.intel.com/graphics/intel-graphics.key | apt-key add - && \
-  echo 'deb [arch=amd64] https://repositories.intel.com/graphics/ubuntu focal main' > /etc/apt/sources.list.d/intel-graphics.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin-server"; \
   else \
@@ -35,11 +27,8 @@ RUN \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
-    libva2="${INTEL_LIBVA_VER}" \
-    libigdgmm11="${INTEL_GMM_VER}" \
-    intel-media-va-driver-non-free="${INTEL_iHD_VER}" \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d7b24a2..7af80e6 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -30,7 +30,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6c4fe41..ce6901e 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -30,7 +30,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
-    jellyfin-ffmpeg \
+    jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
diff --git a/README.md b/README.md
index 41969d6..f295469 100644
--- a/README.md
+++ b/README.md
@@ -303,6 +303,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.06.22:** - Switch to upstream repo's ffmpeg5 build.
 * **05.01.22:** - Specify Intel iHD driver versions to avoid mismatched libva errors.
 * **25.12.21:** - Fix video device group perms error message.
 * **10.12.21:** - Rework readme, disable template sync.
diff --git a/package_versions.txt b/package_versions.txt
index 32aeb69..5e3ef78 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -37,7 +37,7 @@ gzip1.10-0ubuntu4
 hostname3.23
 init-system-helpers1.57
 intel-media-va-driver-non-free21.4.1+i643~u20.04
-jellyfin-ffmpeg4.4.1-4-focal
+jellyfin-ffmpeg55.0.1-5-focal
 jellyfin-server10.8.0-1
 jellyfin-web10.8.0-1
 krb5-locales1.17-6ubuntu4.1
diff --git a/readme-vars.yml b/readme-vars.yml
index fadecc1..4b82972 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -116,6 +116,7 @@ unraid_template_sync: false
 
 # changelog
 changelogs:
+  - { date: "11.06.22:", desc: "Switch to upstream repo's ffmpeg5 build." }
   - { date: "05.01.22:", desc: "Specify Intel iHD driver versions to avoid mismatched libva errors." }
   - { date: "25.12.21:", desc: "Fix video device group perms error message." }
   - { date: "10.12.21:", desc: "Rework readme, disable template sync." }