diff --git a/Dockerfile b/Dockerfile
index a98a862..4dfc80d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,10 +63,10 @@ RUN set -x && \
   mkdir -p /run/www && \
   chown -R www:www /run/www && \
   chmod -R 0700 /run/www && \
-  mkdir -p /config && \
+  mkdir -p /config/media && \
   chown -R www:www /config && \
   chmod -R 0755 /config && \
-  mkdir -p /downloads && \
+  mkdir -p /downloads/{audio,video} && \
   chown -R www:www /downloads && \
   chmod -R 0755 /downloads && \
   # Reset permissions
diff --git a/app/tubesync/local_settings.py.container b/app/tubesync/local_settings.py.container
index af049fc..a281c81 100644
--- a/app/tubesync/local_settings.py.container
+++ b/app/tubesync/local_settings.py.container
@@ -19,5 +19,6 @@ DATABASES = {
 }
 
 
+MEDIA_ROOT = ROOT_DIR / 'config' / 'media'
 SYNC_VIDEO_ROOT = ROOT_DIR / 'downloads' / 'video'
 SYNC_AUDIO_ROOT = ROOT_DIR / 'downloads' / 'audio'