diff --git a/roles/mail/templates/nginx/vhost.j2 b/roles/mail/templates/nginx/vhost.j2
index 70aa0b4..1926459 100644
--- a/roles/mail/templates/nginx/vhost.j2
+++ b/roles/mail/templates/nginx/vhost.j2
@@ -15,7 +15,7 @@ server {
 	}
 
 	location = / {
-		rewrite ^ /listinfo permanent;
+		rewrite ^ /mailman3 redirect;
 	}
 
 	location / {
@@ -27,6 +27,10 @@ server {
 		fastcgi_param PATH_INFO $fastcgi_path_info;
 	}
 
+	location = /listinfo {
+		rewrite ^ /mailman3 redirect;
+	}
+
 	location /images/mailman {
 		alias /usr/share/images/mailman;
 	}