diff --git a/deploy/docker.nginx.template b/deploy/docker.nginx.template
index 218dc3139..9deb75af5 100644
--- a/deploy/docker.nginx.template
+++ b/deploy/docker.nginx.template
@@ -74,8 +74,12 @@ server {
         proxy_pass   http://funkwhale-api/.well-known/;
     }
 
-    location /media/ {
-        alias ${MEDIA_ROOT}/;
+    location /media/__sized__/ {
+        alias ${MEDIA_ROOT}/__sized__/;
+    }
+
+    location /media/attachments/ {
+        alias ${MEDIA_ROOT}/attachments/;
     }
 
     # this is an internal location that is used to serve
diff --git a/deploy/nginx.template b/deploy/nginx.template
index b0c048c1d..5c41fc27e 100644
--- a/deploy/nginx.template
+++ b/deploy/nginx.template
@@ -120,8 +120,12 @@ server {
         proxy_pass   http://funkwhale-api/.well-known/;
     }
 
-    location /media/ {
-        alias ${MEDIA_ROOT}/;
+    location /media/__sized__/ {
+        alias ${MEDIA_ROOT}/__sized__/;
+    }
+
+    location /media/attachments/ {
+        alias ${MEDIA_ROOT}/attachments/;
     }
 
     location /_protected/media {
diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev
index f3a7c8aec..fc66cdb06 100644
--- a/docker/nginx/conf.dev
+++ b/docker/nginx/conf.dev
@@ -108,8 +108,12 @@ http {
             proxy_pass   http://funkwhale-api/api/subsonic/rest/;
         }
 
-        location /media/ {
-            alias /protected/media/;
+        location /media/__sized__/ {
+            alias /protected/media/__sized__/;
+        }
+
+        location /media/attachments/ {
+            alias /protected/media/attachments/;
         }
 
         # this is an internal location that is used to serve