diff --git a/Makefile b/Makefile
index 617993065f..4527e7857b 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ build:
 setup: build
 	docker-compose scale elasticsearch=3
 	# TODO: Makes the snapshot directory writable for all instances. Nicer solution needed.
-	docker-compose run elasticsearch chmod -R 777 /tmp/
+	docker-compose run elasticsearch chmod -R 777 /tmp/backups/
 
 start:
 	docker-compose up
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b47c28c3f..b77c37278d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,5 +23,5 @@ nginx:
 data:
   image: ruflin/elastica-data
   volumes:
-    - "/mount/backups/backup1"
-    - "/mount/backups/backup2"
+    - "/tmp/backups/backup1"
+    - "/tmp/backups/backup2"
diff --git a/env/elasticsearch/elasticsearch.yml b/env/elasticsearch/elasticsearch.yml
index d710a86ef1..fea3890739 100644
--- a/env/elasticsearch/elasticsearch.yml
+++ b/env/elasticsearch/elasticsearch.yml
@@ -36,4 +36,4 @@ thrift.port: 9500
 memcached.port: 11211
 
 # Added for snapshot tests
-path.repo: ["/mount/backups"]
\ No newline at end of file
+path.repo: ["/tmp/backups"]
\ No newline at end of file