diff --git a/stash/Dockerfile b/stash/Dockerfile
new file mode 100644
index 0000000..b9e25cf
--- /dev/null
+++ b/stash/Dockerfile
@@ -0,0 +1,15 @@
+# Add ffmpeg to Filestash for video transcoding support
+FROM machines/filestash:latest
+
+USER root
+
+# Install ffmpeg and ffprobe
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ffmpeg \
+    && rm -rf /var/lib/apt/lists/*
+
+USER filestash
+
+# Verify ffmpeg is installed
+RUN ffmpeg -version && ffprobe -version
diff --git a/stash/compose.yaml b/stash/compose.yaml
index cabf5a4..af31be0 100644
--- a/stash/compose.yaml
+++ b/stash/compose.yaml
@@ -1,6 +1,9 @@
 services:
   filestash:
-    image: ${STASH_IMAGE:-machines/filestash:latest}
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: filestash-ffmpeg:latest
     container_name: ${STASH_COMPOSE_PROJECT_NAME}_app
     restart: unless-stopped
     volumes: