diff --git a/conf/nginx.conf b/conf/nginx.conf
index 98e239c..57f4f50 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,7 +1,38 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
+        rewrite         __PATH__/(.*) /$1 break;
+        rewrite         ^__PATH__$ __PATH__/ permanent;
+        proxy_redirect  / __PATH__/;
+
+        proxy_pass         http://127.0.0.1:__PORT__/;
+        proxy_buffering    off;
+        proxy_set_header   Host $host;
+        proxy_pass_header  Server;
+
+    }
+
+location __PATH__/socket.io {
+    rewrite         __PATH__/socket.io/(.*) /socket.io/$1 break;
+    proxy_redirect  / __PATH__/;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
     proxy_pass         http://127.0.0.1:__PORT__/;
+    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 "upgrade";
+
+}
+
+location __PATH__/admin {
+    rewrite         __PATH__/admin/(.*) /admin/$1 break;
+    proxy_redirect  / __PATH__/;
+    proxy_set_header   X-Proxy-Path __PATH__;
+
+    proxy_pass         http://127.0.0.1:__PORT__/;
+    proxy_buffering    off;
     proxy_set_header   Host $host;
     proxy_pass_header  Server;
 
@@ -23,6 +54,23 @@ location __PATH__/ {
     include conf.d/yunohost_panel.conf.inc;
 }
 
-location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {
-    return 404;
+location __PATH__/admin-auth {
+    rewrite         __PATH__/admin-auth/(.*) /admin-auth/$1 break;
+    proxy_redirect  / __PATH__/;
+    proxy_set_header   X-Proxy-Path __PATH__;
+    proxy_pass         http://127.0.0.1:__PORT__/;
+    proxy_buffering    off;
+    proxy_set_header   Host $host;
+    proxy_pass_header  Server;
+
+    # Note you might want to pass more headers etc too. See above configs.
+}
+
+location __PATH__/static {
+    rewrite  __PATH__/static/(.*) /static/$1 break;
+    proxy_pass         http://127.0.0.1:__PORT__/;
+    proxy_buffering    off;
+    proxy_set_header   Host $host;
+    proxy_pass_header  Server;
+
 }