diff --git a/volumes/conf.d/etherpad.zinomedia.de.conf b/volumes/conf.d/etherpad.zinomedia.de.conf
index 349282d..7c7fd29 100644
--- a/volumes/conf.d/etherpad.zinomedia.de.conf
+++ b/volumes/conf.d/etherpad.zinomedia.de.conf
@@ -15,9 +15,11 @@ server {
     auth_basic "Protected";
     auth_basic_user_file /usr/share/nginx/html/etherpad.zinomedia.de/.htpasswd;
 
+    # Docker DNS
     resolver 127.0.0.11 valid=30s ipv6=off;
 
-    location ~ ^/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|favicon\.ico|robots\.txt|indexBootstrap-.*\.js)$ {
+    # 1) Pass-through (original, no /p/ prefix)
+    location ~ ^/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|redirect|favicon\.ico|robots\.txt|indexBootstrap-.*\.js)$ {
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
         proxy_buffering off;
@@ -31,10 +33,12 @@ server {
         proxy_set_header Connection $connection_upgrade;
     }
 
-    location ~ ^/p/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|favicon\.ico|robots\.txt|indexBootstrap-.*\.js)$ {
-        return 301 /$1$is_args$args; # /p/static/... -> /static/...
+    # 2) Strip /p/ prefix from those same paths (INTERNAL rewrite, no 301)
+    location ~ ^/p/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|redirect|favicon\.ico|robots\.txt|indexBootstrap-.*\.js) {
+        rewrite ^/p/(.*)$ /$1 last;
     }
 
+    # 3) Root -> Etherpad UI
     location = / {
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
@@ -49,7 +53,8 @@ server {
         proxy_set_header Connection $connection_upgrade;
     }
 
-    location ^~ /p/ {
+    # 4) All pad URLs under /p/ — just proxy (NO ^~ so regex above can win)
+    location /p/ {
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
         proxy_buffering off;
@@ -63,6 +68,7 @@ server {
         proxy_set_header Connection $connection_upgrade;
     }
 
+    # 5) Friendly URLs for anything else: /foo -> /p/foo (single 301)
     location / {
         return 301 /p$uri$is_args$args;
     }