diff --git a/conf/nginx.conf b/conf/nginx.conf
index b1254ba..31798eb 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -110,7 +110,7 @@ location /media/attachments/ {
     # if you're storing media files in a S3 bucket.
     #location ~ /_protected/media/(.+) {
     #    internal;
-    #    alias   ${MEDIA_ROOT}/$1;                                           # NON-S3
+    #    alias  __DATA_DIR__/data/media//$1;                                           # NON-S3
     #    # Needed to ensure DSub auth isn't forwarded to S3/Minio, see #932.
 #       proxy_set_header Authorization "";                                  # S3
 #       proxy_pass $1;                                                      # S3
@@ -127,6 +127,18 @@ location /_protected/music/ {
   more_set_headers "Access-Control-Allow-Origin: *";
 }
 
+# Allow direct access to /staticfiles
+location /staticfiles/ {
+  alias __DATA_DIR__/data/static/;
+  more_set_headers "Access-Control-Allow-Origin: *";
+}
+
+# Allow direct access to only specific subdirectories in /media
+location /media/dynamic_preferences/ {
+  alias __DATA_DIR__/data/media/dynamic_preferences/;
+  more_set_headers "Access-Control-Allow-Origin: *";
+}
+
 location /manifest.json {
   return 302 /api/v1/instance/spa-manifest.json;
 }