diff --git a/Dockerfile b/Dockerfile
index 9c99320..9882fe4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,20 +15,15 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 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 jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
+  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \
+  echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
-    jellyfin-server=${JELLYFIN_RELEASE} \
-    jellyfin-ffmpeg5 \
-    jellyfin-web \
-    libfontconfig1 \
-    libfreetype6 \
-    libssl3 \
+    jellyfin=${JELLYFIN_RELEASE} \
     mesa-va-drivers \
     xmlstarlet && \
   echo "**** cleanup ****" && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9d823f5..01b923a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,23 +15,18 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
   echo "**** install jellyfin *****" && \
-  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
+  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \
+  echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
-    jellyfin-server=${JELLYFIN_RELEASE} \
-    jellyfin-ffmpeg5 \
-    jellyfin-web \
-    libfontconfig1 \
-    libfreetype6 \
+    jellyfin=${JELLYFIN_RELEASE} \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
     libraspberrypi0 \
-    libssl3 \
     xmlstarlet && \
   echo "**** cleanup ****" && \
   rm -rf \