diff --git a/ansible/ddclient/Dockerfile b/ansible/docker/ddclient/Dockerfile
similarity index 100%
rename from ansible/ddclient/Dockerfile
rename to ansible/docker/ddclient/Dockerfile
diff --git a/ansible/docker/minio/Dockerfile b/ansible/docker/minio/Dockerfile
new file mode 100644
index 00000000..f3103350
--- /dev/null
+++ b/ansible/docker/minio/Dockerfile
@@ -0,0 +1,13 @@
+FROM armhf/alpine
+
+RUN apk update && apk upgrade && \
+    apk add curl
+
+RUN curl --location --remote-name https://dl.min.io/server/minio/release/linux-arm/minio && \
+    chmod +x minio && \
+    mv minio /usr/sbin
+
+EXPOSE 9000
+VOLUME /data
+
+ENTRYPOINT [ "minio", "server", "/data" ]
diff --git a/ansible/syncthing/Dockerfile b/ansible/docker/syncthing/Dockerfile
similarity index 91%
rename from ansible/syncthing/Dockerfile
rename to ansible/docker/syncthing/Dockerfile
index 02ffe50f..820cf1d6 100644
--- a/ansible/syncthing/Dockerfile
+++ b/ansible/docker/syncthing/Dockerfile
@@ -8,4 +8,7 @@ RUN curl --location --remote-name https://github.com/syncthing/syncthing/release
     mv syncthing-linux-arm-v1.3.2/syncthing /usr/sbin && \
     mkdir /etc/syncthing
 
+RUN adduser -D syncthing
+USER syncthing
+
 ENTRYPOINT [ "syncthing", "-gui-address=0.0.0.0:8384", "-home=/etc/syncthing" ]