diff --git a/autoconfig.yml b/autoconfig.yml
index ccc117c..571f844 100644
--- a/autoconfig.yml
+++ b/autoconfig.yml
@@ -8,10 +8,10 @@
       include_role: name=common
 
     - name: Nginx site for autoconfig
-      include_role: name=julienpalard.nginx
+      include_role: name=nginx
       vars:
         nginx_owner: www-data
-        nginx_domain: autoconfig.afpy.org
+        nginx_name: autoconfig.afpy.org
         nginx_certificates: [autoconfig.afpy.org, autoconfig.pycon.fr]
         nginx_path: /var/www/autoconfig.afpy.org
         nginx_conf: |
@@ -54,14 +54,14 @@
               <displayName>AFPY</displayName>
               <displayShortName>AFPY</displayShortName>
               <incomingServer type="imap">
-                <hostname>mail.afpy.org</hostname>
+                <hostname>mail.gandi.net</hostname>
                 <port>993</port>
                 <socketType>SSL</socketType>
                 <authentication>password-cleartext</authentication>
                 <username>%EMAILADDRESS%</username>
               </incomingServer>
               <outgoingServer type="smtp">
-                <hostname>mail.afpy.org</hostname>
+                <hostname>mail.gandi.net</hostname>
                 <port>587</port>
                 <socketType>STARTTLS</socketType>
                 <authentication>password-cleartext</authentication>