diff --git a/data/templates/nginx/server.tpl.conf b/data/templates/nginx/server.tpl.conf
index 093e96b0e..f2e9de2de 100644
--- a/data/templates/nginx/server.tpl.conf
+++ b/data/templates/nginx/server.tpl.conf
@@ -18,11 +18,11 @@ server {
         return 301 https://$http_host$request_uri;
     }
 
-    location /.well-known/ynh-diagnosis/ {
+    location ^~ '/.well-known/ynh-diagnosis/' {
         alias /tmp/.well-known/ynh-diagnosis/;
     }
 
-    location /.well-known/autoconfig/mail/ {
+    location ^~ '/.well-known/autoconfig/mail/' {
         alias /var/www/.well-known/{{ domain }}/autoconfig/mail/;
     }
 
@@ -52,6 +52,10 @@ server {
     resolver_timeout 5s;
     {% endif %}
 
+    location ^~ '/.well-known/autoconfig/mail/' {
+        alias /var/www/.well-known/{{ domain }}/autoconfig/mail/;
+    }
+
     access_by_lua_file /usr/share/ssowat/access.lua;
 
     include /etc/nginx/conf.d/{{ domain }}.d/*.conf;