diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
index 6f7a57d..d79f299 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/acme_challenge.conf
@@ -84,8 +84,6 @@ map $host $upstream_acme_challenge_host {
     local.ccc.de 172.31.17.151:31820;
     acmedns.hamburg.ccc.de acmedns.hosts.hamburg.ccc.de:31820;
     diday.org 172.31.17.151:31820;
-    did.hamburg.ccc.de 172.31.17.151:31820;
-    staging.did.hamburg.ccc.de 172.31.17.151:31820;
     default "";
 }
 
diff --git a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
index b126fc3..01edbfe 100644
--- a/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
+++ b/resources/chaosknoten/public-reverse-proxy/nginx/nginx.conf
@@ -18,6 +18,7 @@ stream {
     resolver 212.12.50.158 192.76.134.90;
 
     map $ssl_preread_server_name $address {
+        hostnames;
         ccchoir.de ccchoir.hosts.hamburg.ccc.de:8443;
         www.ccchoir.de ccchoir.hosts.hamburg.ccc.de:8443;
         cloud.hamburg.ccc.de cloud.hosts.hamburg.ccc.de:8443;
@@ -101,9 +102,8 @@ stream {
         lokal.ccc.de 172.31.17.151:8443;
         local.ccc.de 172.31.17.151:8443;
         acmedns.hamburg.ccc.de acmedns.hosts.hamburg.ccc.de:8443;
-        did.hamburg.ccc.de 172.31.17.151:8443;
         diday.org 172.31.17.151:8443;
-        staging.did.hamburg.ccc.de 172.31.17.151:8443;
+        *.staging.diday.org 172.31.17.151:8443;
     }
 
     server {