diff --git a/volumes/conf.d/etherpad.zinomedia.de.conf b/volumes/conf.d/etherpad.zinomedia.de.conf
index bc08317..6e87378 100644
--- a/volumes/conf.d/etherpad.zinomedia.de.conf
+++ b/volumes/conf.d/etherpad.zinomedia.de.conf
@@ -21,28 +21,7 @@ server {
     auth_basic "Protected";
     auth_basic_user_file /usr/share/nginx/html/etherpad.zinomedia.de/.htpasswd;
 
-    location / {
-        rewrite ^/$ / break;
-        rewrite ^/locales/(.*) /locales/$1 break;
-        rewrite ^/locales.json /locales.json break;
-        rewrite ^/admin(.*) /admin$1 break;
-        rewrite ^/p/(.*) /p/$1 break;
-        rewrite ^/static/(.*) /static/$1 break;
-        rewrite ^/pluginfw/(.*) /pluginfw/$1 break;
-        rewrite ^/javascripts/(.*) /javascripts/$1 break;
-        rewrite ^/socket.io/(.*) /socket.io/$1 break;
-        rewrite ^/ep/(.*) /ep/$1 break;
-        rewrite ^/minified/(.*) /minified/$1 break;
-        rewrite ^/api/(.*) /api/$1 break;
-        rewrite ^/ro/(.*) /ro/$1 break;
-        rewrite ^/error/(.*) /error/$1 break;
-        rewrite ^/jserror(.*) /jserror$1 break;
-        rewrite ^/redirect(.*) /redirect$1 break;
-        rewrite ^/(.*\.js) /$1 break;
-        rewrite /favicon.ico /favicon.ico break;
-        rewrite /robots.txt /robots.txt break;
-        rewrite /(.*) /p/$1;
-
+    location ~ ^/(locales/|locales.json|admin/|static/|pluginfw/|javascripts/|socket.io/|ep/|minified/|api/|ro/|error/|jserror/|favicon.ico|robots.txt|.*\.js) {
         resolver 127.0.0.11;
         set $upstream "http://etherpad:9001";
         proxy_pass $upstream;
@@ -50,6 +29,46 @@ server {
         proxy_buffering off;
         proxy_set_header Host $host;
         proxy_pass_header Server;
+
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+    }
+
+    location /p/ {
+        rewrite ^/p/(.*) /$1 redirect;
+    }
+
+    location ~ ^/$ {
+        resolver 127.0.0.11;
+        set $upstream "http://etherpad:9001";
+        proxy_pass $upstream;
+
+        proxy_buffering off;
+        proxy_set_header Host $host;
+        proxy_pass_header Server;
+
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+    }
+
+
+    location / {
+        resolver 127.0.0.11;
+        set $upstream "http://etherpad:9001";
+        proxy_pass $upstream;
+
+        proxy_buffering off;
+        proxy_set_header Host $host;
+        proxy_pass_header Server;
+
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;