diff --git a/conf/nginx.conf b/conf/nginx.conf
index 1a4cd60..c1a87f0 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,3 +13,31 @@ location __PATH__/ {
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
+
+
+# media caching stuff
+# https://docs.gotosocial.org/en/latest/advanced/caching/assets-media/#nginx
+
+location /assets/ {
+  alias web-asset-base-dir/;
+  autoindex off;
+  expires 5m;
+  add_header Cache-Control "public";
+}
+
+location @fileserver {
+  proxy_pass http://localhost:__PORT__;
+  proxy_set_header Host $host;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection "upgrade";
+  proxy_set_header X-Forwarded-For $remote_addr;
+  proxy_set_header X-Forwarded-Proto $scheme;
+}
+
+location /fileserver/ {
+  alias storage-local-base-path/;
+  autoindex off;
+  expires 1w;
+  add_header Cache-Control "private, immutable";
+  try_files $uri @fileserver;
+}
\ No newline at end of file