diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf
index 1403e46..f550057 100644
--- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf
+++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/acme_challenge.conf
@@ -12,9 +12,7 @@ map $host $upstream_acme_challenge_host {
     matrix.hamburg.ccc.de 172.31.17.150:31820;
     element.hamburg.ccc.de 172.31.17.151:31820;
     branding-resources.hamburg.ccc.de 172.31.17.151:31820;
-    www.hamburg.ccc.de 172.31.17.151:31820;
-    hamburg.ccc.de 172.31.17.151:31820;
-    staging.hamburg.ccc.de 172.31.17.151:31820;
+    next.hamburg.ccc.de 172.31.17.151:31820;
     spaceapi.hamburg.ccc.de 172.31.17.151:31820;
     zammad.hamburg.ccc.de 172.31.17.152:31820;
     c3cat.de 172.31.17.151:31820;
diff --git a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf
index c3c05ed..a2191d7 100644
--- a/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf
+++ b/playbooks/files/chaosknoten/configs/public-reverse-proxy/nginx/nginx.conf
@@ -31,9 +31,7 @@ stream {
         matrix.hamburg.ccc.de 172.31.17.150:8443;
         element.hamburg.ccc.de 172.31.17.151:8443;
         branding-resources.hamburg.ccc.de 172.31.17.151:8443;
-        www.hamburg.ccc.de 172.31.17.151:8443;
-        hamburg.ccc.de 172.31.17.151:8443;
-        staging.hamburg.ccc.de 172.31.17.151:8443;
+        next.hamburg.ccc.de 172.31.17.151:8443;
         spaceapi.hamburg.ccc.de 172.31.17.151:8443;
         zammad.hamburg.ccc.de 172.31.17.152:8443;
         c3cat.de 172.31.17.151:8443;
diff --git a/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf b/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf
index ccdd224..814a553 100644
--- a/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf
+++ b/playbooks/files/chaosknoten/configs/wiki/nginx/wiki.hamburg.ccc.de.conf
@@ -72,14 +72,14 @@ server {
     }
 
     location /ChaosVPN {
-        return 302 https://oldwiki.hamburg.ccc.de$request_uri;
+        return 302 https://oldwiki.hamburg.ccc.de$uri;
     }
 
     location ~ /EH(07|09|11) {
-        return 302 https://oldwiki.hamburg.ccc.de$request_uri;
+        return 302 https://oldwiki.hamburg.ccc.de$uri;
     }
 
     location /Easter {
-        return 302 https://oldwiki.hamburg.ccc.de$request_uri;
+        return 302 https://oldwiki.hamburg.ccc.de$uri;
     }
 }