diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py
index fe4f7e4..4582d90 100644
--- a/jdav_web/jdav_web/settings.py
+++ b/jdav_web/jdav_web/settings.py
@@ -31,8 +31,10 @@ DEBUG = os.environ.get('DJANGO_DEBUG', '1') == '1'
 ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOST', '').split(",")
 
 # Define media paths e.g. for image storage
-MEDIA_ROOT = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")
 MEDIA_URL = '/media/'
+MEDIA_ROOT = os.environ.get('DJANGO_MEDIA_ROOT',
+			    os.path.join((os.path.join(BASE_DIR, os.pardir)), "media"))
+MEDIA_MEMBERLISTS = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media")
 
 # x forward
 
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index aa58008..22a32ad 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -360,8 +360,8 @@ admin.site.register(ActivityCategory, ActivityCategoryAdmin)
 
 
 def media_path(fp):
-    return os.path.join(os.path.join(settings.MEDIA_ROOT, "memberlists"), fp)
+    return os.path.join(os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists"), fp)
 
 
 def media_dir():
-    return os.path.join(settings.MEDIA_ROOT, "memberlists")
+    return os.path.join(settings.MEDIA_MEMBERLISTS, "memberlists")