diff --git a/Makefile b/Makefile
index 3f0e669b..f65b3a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -330,4 +330,5 @@ build-k8s-cluster: ## build the kubernetes cluster using kind
 
 start-tilt: ## start the kubernetes cluster using kind
 	tilt up -f ./bin/Tiltfile
-.PHONY: build-k8s-cluster
\ No newline at end of file
+.PHONY: build-k8s-cluster
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d5d7f0d..7f40d6e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,31 @@ services:
     ports:
       - "1081:1080"
 
+  minio:
+    user: ${DOCKER_USER:-1000}
+    image: minio/minio
+    environment:
+      - MINIO_ROOT_USER=impress
+      - MINIO_ROOT_PASSWORD=password
+    ports:
+      - '9000:9000'
+      - '9001:9001'
+    entrypoint: ""
+    command: minio server --console-address :9001 /data
+    volumes:
+      - ./data/media:/data
+
+  createbuckets:
+    image: minio/mc
+    depends_on:
+      - minio
+    entrypoint: >
+      sh -c "
+      /usr/bin/mc alias set impress http://minio:9000 impress password && \
+      /usr/bin/mc mb impress/impress-media-storage && \
+      /usr/bin/mc version enable impress/impress-media-storage && \
+      exit 0;"
+
   app-dev:
     build:
       context: .
@@ -40,6 +65,7 @@ services:
         - postgresql
         - mailcatcher
         - redis
+        - createbuckets
   
   celery-dev:
     user: ${DOCKER_USER:-1000}
@@ -75,6 +101,7 @@ services:
     depends_on:
       - postgresql
       - redis
+      - minio
 
   celery:
     user: ${DOCKER_USER:-1000}