diff --git a/Dockerfile b/Dockerfile
index 0d4aedd51..973d1866b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,5 +30,5 @@ RUN chmod +x /sapl/start.sh
 
 RUN pip install -r requirements/requirements.txt --upgrade setuptools --no-cache-dir
 
-VOLUME ["/sapl/data"]
+VOLUME ["/sapl/data", "/sapl/media", "/sapl/collected_static"]
 ENTRYPOINT ["/sapl/start.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index dbc1e154c..051ac592b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,12 +14,14 @@ sapldb:
     POSTGRES_DB: sapl
     PGDATA : /var/lib/postgresql/data/
   volumes:
-    - ./postgres-data/data/:/var/lib/postgresql/data/
+    - ./postgres-data/data/:/var/lib/postgresql/data/     
   ports:
     - "5532:5432"
 web:
   build: .
   volumes:
     - .:/sapl
+    - ./media:/sapl/media
+    - ./collected_static:/sapl/collected_static
   links:
     - sapldb
diff --git a/start.sh b/start.sh
old mode 100755
new mode 100644
index 5c2ab55e5..102fb4a04
--- a/start.sh
+++ b/start.sh
@@ -2,8 +2,11 @@
 
 python3 gen-env.py
 python3 manage.py bower install
-python3 manage.py collectstatic --no-input
-python3 manage.py rebuild_index --noinput
+
 /bin/sh busy-wait.sh
+
 python3 manage.py migrate
+python3 manage.py collectstatic --no-input
+python3 manage.py rebuild_index --noinput
+
 /bin/sh gunicorn_start.sh