diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index 8895ac57..ff328e39 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -4,7 +4,14 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
 
 # Supervisor apt dependencies
 RUN apt-get -q update \
-	&& apt-get install -qqy socat supervisor rsync btrfs-tools jq --no-install-recommends \
+	&& apt-get install -qqy \
+		btrfs-tools \
+		docker.io \
+		jq \
+		rsync \
+		socat \
+		supervisor \
+		--no-install-recommends \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
diff --git a/Dockerfile.armv7hf b/Dockerfile.armv7hf
index 27302de4..23f49ae7 100644
--- a/Dockerfile.armv7hf
+++ b/Dockerfile.armv7hf
@@ -4,7 +4,14 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
 
 # Supervisor apt dependencies
 RUN apt-get -q update \
-	&& apt-get install -qqy socat supervisor rsync btrfs-tools jq --no-install-recommends \
+	&& apt-get install -qqy \
+		btrfs-tools \
+		docker.io \
+		jq \
+		rsync \
+		socat \
+		supervisor \
+		--no-install-recommends \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
diff --git a/Dockerfile.i386 b/Dockerfile.i386
index 608772db..dc770e9a 100644
--- a/Dockerfile.i386
+++ b/Dockerfile.i386
@@ -4,7 +4,14 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
 
 # Supervisor apt dependencies
 RUN apt-get -q update \
-	&& apt-get install -qqy socat supervisor rsync btrfs-tools jq --no-install-recommends \
+	&& apt-get install -qqy \
+		btrfs-tools \
+		docker.io \
+		jq \
+		rsync \
+		socat \
+		supervisor \
+		--no-install-recommends \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
 
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index d0b85547..8bb35941 100644
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@@ -4,7 +4,14 @@ COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/
 
 # Supervisor apt dependencies
 RUN apt-get -q update \
-	&& apt-get install -qqy socat supervisor rsync btrfs-tools jq --no-install-recommends \
+	&& apt-get install -qqy \
+		btrfs-tools \
+		docker.io \
+		jq \
+		rsync \
+		socat \
+		supervisor \
+		--no-install-recommends \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/