diff --git a/tubesync/tubesync/settings.py b/tubesync/tubesync/settings.py
index d67d577a..c43bf15c 100644
--- a/tubesync/tubesync/settings.py
+++ b/tubesync/tubesync/settings.py
@@ -112,6 +112,15 @@ DOWNLOAD_VIDEO_DIR = 'video'
 DOWNLOAD_AUDIO_DIR = 'audio'
 SASS_PROCESSOR_ROOT = STATIC_ROOT
 
+directory_mode = os.getenv("TUBESYNC_DIRECTORY_MODE", "default")
+if directory_mode == 'flat':
+    DOWNLOAD_VIDEO_DIR = '.'
+    DOWNLOAD_AUDIO_DIR = '.'
+elif directory_mode.startswith("custom:"):
+    custom_value = directory_mode.split(":")[1]
+    if str(',') in custom_value:
+        DOWNLOAD_AUDIO_DIR, DOWNLOAD_VIDEO_DIR = custom_value.split(',')
+
 
 ROBOTS = '''
 User-agent: *