diff --git a/nginx/conf.d/default.conf.template b/nginx/conf.d/default.conf.template
index 0f7db57a..febcb9cd 100644
--- a/nginx/conf.d/default.conf.template
+++ b/nginx/conf.d/default.conf.template
@@ -79,8 +79,8 @@ server {
     # Rewrites /media/* to /api/* (matches Vite dev proxy behavior)
     # Uses variable proxy_pass for runtime DNS resolution after container restarts
     location /media/ {
-        rewrite ^/media/(.*) /api/$1 break;
         set $upstream_media_default http://changemaker-media-api:4100;
+        rewrite ^/media/(.*) /api/$1 break;
         proxy_pass $upstream_media_default;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -126,5 +126,9 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+
+        # WebSocket support (docs collaboration)
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 }
diff --git a/nginx/conf.d/services.conf.template b/nginx/conf.d/services.conf.template
index 0d00d175..9e530917 100644
--- a/nginx/conf.d/services.conf.template
+++ b/nginx/conf.d/services.conf.template
@@ -194,6 +194,7 @@ server {
         set $upstream_vaultwarden http://vaultwarden-changemaker:80;
         proxy_pass $upstream_vaultwarden;
         proxy_hide_header X-Frame-Options;
+        proxy_hide_header Content-Security-Policy;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -444,8 +445,8 @@ server {
     # Rewrites /media/* to /api/* (matches Vite dev proxy behavior)
     # Uses variable proxy_pass for runtime DNS resolution after container restarts
     location /media/ {
-        rewrite ^/media/(.*) /api/$1 break;
         set $upstream_media_app http://changemaker-media-api:4100;
+        rewrite ^/media/(.*) /api/$1 break;
         proxy_pass $upstream_media_app;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -502,6 +503,10 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+
+        # WebSocket support (docs collaboration)
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 }