diff --git a/volumes/conf.d/etherpad.zinomedia.de.conf b/volumes/conf.d/etherpad.zinomedia.de.conf
index dea66b3..729c194 100644
--- a/volumes/conf.d/etherpad.zinomedia.de.conf
+++ b/volumes/conf.d/etherpad.zinomedia.de.conf
@@ -4,8 +4,8 @@ map $http_upgrade $connection_upgrade {
 }
 
 server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
     server_name etherpad.zinomedia.de;
 
     # TLS (yours)
@@ -16,58 +16,70 @@ server {
     auth_basic "Protected";
     auth_basic_user_file /usr/share/nginx/html/etherpad.zinomedia.de/.htpasswd;
 
-    # Docker DNS (because proxying to "etherpad")
+    # Docker DNS for container name resolution
     resolver 127.0.0.11 valid=30s ipv6=off;
 
-    # ---- Allow normal files to pass through (exactly as in wiki) ----
+    # 1) Pass-through for static, admin, socket.io, etc.  (no friendly rewrite)
     location ~ ^/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror/|favicon\.ico|robots\.txt|.*\.js)$ {
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
         proxy_buffering off;
-        proxy_set_header Host $host;
-        proxy_pass_header Server;
         proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
         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;
+        proxy_set_header Upgrade $http_upgrade; # websockets
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass_header Server;
     }
 
-    # ---- Redirect /p/* to friendly version /<padname> (exactly as in wiki) ----
+    # 2) /p/... -> internally rewrite to /..., then proxy (NO redirect!)
     location /p/ {
-        rewrite ^/p/(.*) /$1 redirect;
-    }
-
-    # ---- Home page ----
-    location ~ ^/$ {
+        rewrite ^/p/(.*)$ /$1 break;
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
         proxy_buffering off;
-        proxy_set_header Host $host;
-        proxy_pass_header Server;
         proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
         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;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass_header Server;
     }
 
-    # ---- Handle pad URLs: keep browser at /<pad>, map upstream redirects / -> /p/ ----
+    # 3) Home page
+    location = / {
+        set $upstream "http://etherpad:9001";
+        proxy_pass $upstream;
+        proxy_buffering off;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        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;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass_header Server;
+    }
+
+    # 4) Everything else (pad URLs): keep browser at /<pad>, but let upstream redirect to /p/<pad>
     location / {
-        proxy_redirect / /p/;
+        # Important: map upstream Location: /p/...  -->  client sees /
+        proxy_redirect /p/ /;
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
         proxy_buffering off;
-        proxy_set_header Host $host;
-        proxy_pass_header Server;
         proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
         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;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass_header Server;
     }
 }