diff --git a/Makefile b/Makefile
index eca2fe4..7708c70 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,12 @@ test_down:
 	docker-compose down
 
 test_prepare:
-	mkdir -p data/postgres
 	docker-compose up -d minio db redis
 	docker-compose up -d cworker conductor
 	docker-compose up minio-prepare
 
 test: test_prepare
-	go test -covermode=count -coverprofile=coverage.out ./...
+	go test -exclude="docker-data" -covermode=count -coverprofile=coverage.out ./...
 
 towerz:
 	docker run --rm -v "$(PWD)":/usr/src/transcoder -w /usr/src/transcoder --platform linux/amd64 golang:1.16.10 make tower
diff --git a/docker-compose.yml b/docker-compose.yml
index 14428b0..7a4ac9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,7 +52,7 @@ services:
     ports:
       - '6379:6379'
     volumes:
-      - ./data/redis:/data
+      - ./docker-data/redis:/data
     command: >
       --requirepass odyredis --appendonly yes
     labels:
@@ -66,7 +66,7 @@ services:
     environment:
       POSTGRES_PASSWORD: odyseeteam
     volumes:
-      - ./data/postgres:/var/lib/postgresql/data
+      - ./docker-data/postgres:/var/lib/postgresql/data
     command:
       - -clogging_collector=on
       - -clog_statement=all
@@ -84,7 +84,7 @@ services:
       - "38861:38861"
       - "41949:41949"
     volumes:
-      - ./data/minio:/data
+      - ./docker-data/minio:/data
     environment:
       MINIO_ROOT_USER: ody
       MINIO_ROOT_PASSWORD: odyseetes3
@@ -92,7 +92,7 @@ services:
   minio-prepare:
     image: minio/mc
     volumes:
-      - ./data/minio:/data
+      - ./docker-data/minio:/data
     entrypoint: >
       /bin/sh -c "
       /usr/bin/mc config host add myminio http://minio:9000 ody odyseetes3;