diff --git a/Dockerfile b/Dockerfile
index 05cf652e..e0a3ba77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,20 +2,19 @@ FROM python:3.13.5-bookworm AS build-image
 
 # Install system dependencies needed for downloading and extracting
 RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends wget xz-utils unzip ffmpeg && \
+    apt-get install -y --no-install-recommends wget xz-utils unzip && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get purge --auto-remove && \
     apt-get clean
 
-# Install ffmpeg - using apt package instead of static binary for faster builds
-# Original static binary download hangs in github actions:
-# RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
-#     mkdir -p ffmpeg-tmp && \
-#     tar -xf ffmpeg-release-amd64-static.tar.xz --strip-components 1 -C ffmpeg-tmp && \
-#     cp -v ffmpeg-tmp/ffmpeg ffmpeg-tmp/ffprobe ffmpeg-tmp/qt-faststart /usr/local/bin && \
-#     rm -rf ffmpeg-tmp ffmpeg-release-amd64-static.tar.xz
+RUN wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
 
-# Install Bento4 in the specified location
+RUN mkdir -p ffmpeg-tmp && \
+    tar -xf ffmpeg-release-amd64-static.tar.xz --strip-components 1 -C ffmpeg-tmp && \
+    cp -v ffmpeg-tmp/ffmpeg ffmpeg-tmp/ffprobe ffmpeg-tmp/qt-faststart /usr/local/bin && \
+    rm -rf ffmpeg-tmp ffmpeg-release-amd64-static.tar.xz
+
+    # Install Bento4 in the specified location
 RUN mkdir -p /home/mediacms.io/bento4 && \
     wget -q http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip && \
     unzip Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip -d /home/mediacms.io/bento4 && \
@@ -35,19 +34,18 @@ ENV CELERY_APP='cms'
 ENV VIRTUAL_ENV=/home/mediacms.io
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-# Install runtime system dependencies (including ffmpeg)
+# Install runtime system dependencies
 RUN apt-get update -y && \
     apt-get -y upgrade && \
-    apt-get install --no-install-recommends supervisor nginx imagemagick procps pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl ffmpeg -y && \
+    apt-get install --no-install-recommends supervisor nginx imagemagick procps pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl -y && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get purge --auto-remove && \
     apt-get clean
 
-# Copy Bento4 from build image (ffmpeg now available system-wide via apt)
-# Original binary copying (no longer needed):
-# COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-# COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe
-# COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart
+# Copy ffmpeg and Bento4 from build image
+COPY --from=build-image /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
+COPY --from=build-image /usr/local/bin/ffprobe /usr/local/bin/ffprobe
+COPY --from=build-image /usr/local/bin/qt-faststart /usr/local/bin/qt-faststart
 COPY --from=build-image /home/mediacms.io/bento4 /home/mediacms.io/bento4
 
 # Set up virtualenv
@@ -71,6 +69,7 @@ COPY . /home/mediacms.io/mediacms
 WORKDIR /home/mediacms.io/mediacms
 
 # required for sprite thumbnail generation for large video files
+
 COPY deploy/docker/policy.xml /etc/ImageMagick-6/policy.xml
 
 # Set process control environment variables