diff --git a/docs/devnotes.md b/docs/devnotes.md
index a12f43e3..66f5dcc6 100644
--- a/docs/devnotes.md
+++ b/docs/devnotes.md
@@ -494,9 +494,12 @@ to get started, first `cd` into the `scripts` folder
 * if you want to build a pypi package, now run `./make-pypi-release.sh d`
 
 * if you want to build a docker-image, you have two options:
-  * if you want to use podman to build all docker-images for all supported architectures, now run `(cd docker; ./make.sh hclean; ./make.sh hclean pull img)`
+  * if you want to use podman to build all docker-images for all supported architectures, now run `(cd docker; make -C base; ./make.sh hclean; ./make.sh hclean pull img)`
   * if you want to use docker to build all docker-images for your native architecture, now run `sudo make -C docker`
   * if you want to do something else, please take a look at `docker/make.sh` or `docker/Makefile` for inspiration
+  * beware of the following:
+    * if you build with docker, you get the [stock alpine-provided ffmpeg](https://github.com/9001/copyparty/blob/hovudstraum/docs/bad-codecs.md), which makes the docker-image almost twice as big
+    * if you build with podman (make.sh) you get the copyparty-official legally-comfy custom ffmpeg, but the first build takes about 2-3 hours longer
 
 * if you want to build the windows exe, first grab some snacks and a beer, [you'll need it](https://github.com/9001/copyparty/tree/hovudstraum/scripts/pyinstaller)
 
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 8b8ff68a..6d5b7d85 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -6,7 +6,12 @@ all:
 	
 	rm -rf i
 	mkdir i
-	tar -cC../.. dist/copyparty-sfx.py bin/mtag | tar -xvCi
+	tar -cC../../dist    copyparty-sfx.py          | tar -xvCi
+	tar -cC../..         bin/mtag                  | tar -xvCi
+    
+#   # use stock ffmpeg because ./base/Makefile requires podman;
+#   # beware: https://github.com/9001/copyparty/blob/hovudstraum/docs/bad-codecs.md
+	touch i/stock_ffmpeg
 	
 	docker build -t copyparty/min:latest -f Dockerfile.min .
 	echo 'scale=1;'`docker save copyparty/min:latest | pigz -c | wc -c`/1024/1024 | bc
diff --git a/scripts/docker/innvikler.sh b/scripts/docker/innvikler.sh
index d6b113fb..ce993b24 100644
--- a/scripts/docker/innvikler.sh
+++ b/scripts/docker/innvikler.sh
@@ -14,8 +14,11 @@ ised() {
 	tmv "$2"
 }
 
+# use stock ffmpeg if requested
+echo $1 | grep -qE 'ac|iv|dj' && [ -e "/z/stock_ffmpeg" ] && apk add ffmpeg
+
 # use custom ffmpeg if relevant
-echo $1 | grep -qE 'ac|iv|dj' && (
+echo $1 | grep -qE 'ac|iv|dj' && [ ! -e "/z/stock_ffmpeg" ] && (
   cp -pv /z/packages/*.pub /etc/apk/keys/
   cd /z/packages/$(cat /etc/apk/arch)
   apk add ./ffmpeg-*.apk