diff --git a/docker-compose.yml b/docker-compose.yml
index b9f8adf7..1a091090 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     ports:
       - "5432"
     volumes:
-      - dbdata:/var/lib/postgresql/data
+      - dbdata:/var/lib/postgresql/data:Z
     restart: unless-stopped
     oom_score_adj: -100
   webapp:
@@ -19,7 +19,7 @@ services:
     container_name: webapp
     entrypoint: /bin/bash -c "chmod +x /webodm/*.sh && /bin/bash -c \"/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/start.sh\""
     volumes:
-      - ${WO_MEDIA_DIR}:/webodm/app/media
+      - ${WO_MEDIA_DIR}:/webodm/app/media:z
     ports:
       - "${WO_PORT}:8000"
     depends_on:
@@ -44,7 +44,7 @@ services:
     container_name: worker
     entrypoint: /bin/bash -c "/webodm/wait-for-postgres.sh db /webodm/wait-for-it.sh -t 0 broker:6379 -- /webodm/wait-for-it.sh -t 0 webapp:8000 -- /webodm/worker.sh start"
     volumes:
-      - ${WO_MEDIA_DIR}:/webodm/app/media
+      - ${WO_MEDIA_DIR}:/webodm/app/media:z
     depends_on:
       - db
       - broker
diff --git a/webodm/settings.py b/webodm/settings.py
index 00c29dc4..2e56ecb5 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -258,6 +258,8 @@ if TESTING:
     MEDIA_ROOT = os.path.join(BASE_DIR, 'app', 'media_test')
 MEDIA_TMP = os.path.join(MEDIA_ROOT, 'tmp')
 
+FILE_UPLOAD_TEMP_DIR = MEDIA_TMP
+
 # Store flash messages in cookies
 MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
 MESSAGE_TAGS = {