diff --git a/docker/create-mc-defaults.sh b/docker/create-mc-defaults.sh
new file mode 100755
index 00000000..fa843a8e
--- /dev/null
+++ b/docker/create-mc-defaults.sh
@@ -0,0 +1,9 @@
+mc alias s minio http://minio:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD
+
+for f in $(mc ls -q --no-color --json minio | jq .key | xargs echo); do
+  mc rb --force minio/$f
+done
+
+for d in $(echo $MINIO_DEFAULT_BUCKETS); do
+  mc mb minio/$d
+done
diff --git a/docker/jq b/docker/jq
new file mode 100755
index 00000000..f48b0ca9
Binary files /dev/null and b/docker/jq differ
diff --git a/docker/mc.Dockerfile b/docker/mc.Dockerfile
new file mode 100644
index 00000000..7e803e92
--- /dev/null
+++ b/docker/mc.Dockerfile
@@ -0,0 +1,8 @@
+FROM bitnami/minio-client
+
+WORKDIR /app
+
+COPY ./docker/jq /usr/bin
+COPY docker/create-mc-defaults.sh .
+
+ENTRYPOINT [ "sh", "/app/create-mc-defaults.sh" ]