diff --git a/modoboa_installer/scripts/files/nginx/automx.conf.tpl b/modoboa_installer/scripts/files/nginx/automx.conf.tpl
index 4cd0591..1bd748c 100644
--- a/modoboa_installer/scripts/files/nginx/automx.conf.tpl
+++ b/modoboa_installer/scripts/files/nginx/automx.conf.tpl
@@ -6,6 +6,7 @@ server {
     listen 80;
     listen [::]:80;
     server_name %hostname;
+    root /srv/automx/instance;
 
     access_log /var/log/nginx/%{hostname}-access.log;
     error_log /var/log/nginx/%{hostname}-error.log;
diff --git a/modoboa_installer/scripts/nginx.py b/modoboa_installer/scripts/nginx.py
index bbff33a..4f7c4f3 100644
--- a/modoboa_installer/scripts/nginx.py
+++ b/modoboa_installer/scripts/nginx.py
@@ -63,7 +63,7 @@ class Nginx(base.Installer):
                 self.config.get("general", "domain"))
             self._setup_config("automx", hostname)
             extra_modoboa_config = """
-    location /autodiscover/autodiscover.xml {
+    location ~* ^/autodiscover/autodiscover.xml {
         include uwsgi_params;
         uwsgi_pass automx;
     }