diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index b793408..6bd1f60 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_JELLYFIN_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}')
+          EXT_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for jellyfin branch master"
diff --git a/Dockerfile b/Dockerfile
index 949a449..173ac10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,15 +22,17 @@ RUN \
   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"; \
+    JELLYFIN="jellyfin-server"; \
   else \
-    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
     intel-media-va-driver-non-free \
     ${JELLYFIN} \
+    jellyfin-ffmpeg \
+    jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libssl1.1 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index bb3d6e5..d7b24a2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -22,14 +22,16 @@ RUN \
   echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
   echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-    JELLYFIN="jellyfin"; \
+    JELLYFIN="jellyfin-server"; \
   else \
-    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
+    jellyfin-ffmpeg \
+    jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libomxil-bellagio0 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 76d2770..6c4fe41 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -22,14 +22,16 @@ RUN \
   echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
   echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-    JELLYFIN="jellyfin"; \
+    JELLYFIN="jellyfin-server"; \
   else \
-    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
+    jellyfin-ffmpeg \
+    jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libomxil-bellagio0 \
diff --git a/Jenkinsfile b/Jenkinsfile
index ae33751..a24a864 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}' ''',
+            script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/README.md b/README.md
index 6d606ed..a20856e 100644
--- a/README.md
+++ b/README.md
@@ -324,6 +324,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.09.21:** - Pull only the server, web and ffmpeg packages instead of the wrapper.
 * **23.06.21:** - Add log message if device permissions are incorrect. Pin jellyfin dependency versions to prevent upstream apt repo issues. Deprecate the `bionic` tag.
 * **21.05.21:** - Add nvidia.icd file to fix missing tonemapping using Nvidia HW.
 * **20.01.21:** - Add Jellyfin Binary Environmentals
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 3249901..b1b1c8f 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-jellyfin
 external_type: na
-custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master
diff --git a/readme-vars.yml b/readme-vars.yml
index e5c411f..17be826 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -115,6 +115,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "22.09.21:", desc: "Pull only the server, web and ffmpeg packages instead of the wrapper." }
   - { date: "23.06.21:", desc: "Add log message if device permissions are incorrect. Pin jellyfin dependency versions to prevent upstream apt repo issues. Deprecate the `bionic` tag." }
   - { date: "21.05.21:", desc: "Add nvidia.icd file to fix missing tonemapping using Nvidia HW." }
   - { date: "20.01.21:", desc: "Add Jellyfin Binary Environmentals" }