diff --git a/runbot/templates/nginx.xml b/runbot/templates/nginx.xml
index f0a7f67b..d4f41f72 100644
--- a/runbot/templates/nginx.xml
+++ b/runbot/templates/nginx.xml
@@ -47,7 +47,7 @@ server {
 <t t-foreach="builds" t-as="build">
 server {
     listen 8080;
-    server_name ~^<t t-raw="re_escape(build.dest)"/>[-.].*$;
+    server_name ~^<t t-raw="re_escape(build.dest)"/>(-[a-z0-9]+)?\.<t t-raw="re_escape(fqdn)"/>$;
     location / { proxy_pass http://127.0.0.1:<t t-esc="build.port"/>; }
     location /longpolling { proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>; }
 }