diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 1407f07e..bbc4a691 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -14,9 +14,9 @@ contact_links:
     - name: 🐳 Docker Forum
       url: https://forums.docker.com/
       about: Ask a question, get assistance or start a discussion regarding Docker
-    - name: 🐛 Bug Report: Nextcloud Server
+    - name: 🐛 Bug Report - Nextcloud Server
       url: https://github.com/nextcloud/server/issues/new/choose
       about: Report a bug in Nextcloud Server
-    - name: Enhancement Idea: Nextcloud Server
+    - name: Enhancement Idea - Nextcloud Server
       url: https://github.com/nextcloud/server/issues/new/choose
       about: Suggest an enhancement idea for Nextcloud Server
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 3ca9ab54..1fb89a86 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 47179e44..6bd0f220 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index 3a984575..87d0e3ba 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 472e005d..579629c6 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index b060e713..8c22fb4a 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 85d0f477..3200d8a6 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 2295bddf..242a493d 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -7,6 +7,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8734caa9..72729fdf 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -8,6 +8,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \