diff --git a/a-lec.org.zone b/a-lec.org.zone
index fe0b4ea..cf307c3 100644
--- a/a-lec.org.zone
+++ b/a-lec.org.zone
@@ -26,9 +26,9 @@ _imap._tcp              IN SRV      0 0 0 .
 _imaps._tcp             IN SRV      0 1 993 mail.a-lec.org.
 _pop3._tcp              IN SRV      10 0 0 .
 _pop3s._tcp             IN SRV      10 0 0 .
-imap                    IN CNAME    mail
-smtp                    IN CNAME    mail
-autoconfig              IN CNAME    mail
+imap                    IN CNAME    mail.a-lec.org.
+smtp                    IN CNAME    mail.a-lec.org.
+autoconfig              IN CNAME    mail.a-lec.org.
 
 gnuboot                 IN A        80.67.176.33
 gnuboot                 IN AAAA     2001:910:1021::44
@@ -69,39 +69,39 @@ stockage                IN AAAA     2001:910:1021::188
 
 xmpp                    IN A        80.67.176.33
 xmpp                    IN AAAA     2001:910:1021::211
-salons                  IN CNAME    xmpp
-pubsub                  IN CNAME    xmpp
-proxy                   IN CNAME    xmpp
-comments                IN CNAME    xmpp
-news                    IN CNAME    xmpp
-matrix                  IN CNAME    xmpp
-matrix-gateway          IN CNAME    xmpp
+salons                  IN CNAME    xmpp.a-lec.org.
+pubsub                  IN CNAME    xmpp.a-lec.org.
+proxy                   IN CNAME    xmpp.a-lec.org.
+comments                IN CNAME    xmpp.a-lec.org.
+news                    IN CNAME    xmpp.a-lec.org.
+matrix                  IN CNAME    xmpp.a-lec.org.
+matrix-gateway          IN CNAME    xmpp.a-lec.org.
 _5222._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
 _5223._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
 _5269._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
 _5222._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
 _5223._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
 _5269._tcp.xmpp         IN TLSA     3 1 1 1d4d18d0b2a5e80219b63e78439d4cfd77e2fcc372df78dfc80f674a815da5d8
-_jabber                 IN SRV      5 0 5269 xmpp
-_stun._tcp              IN SRV      5 0 3478 xmpp
-_stun._udp              IN SRV      5 0 3478 xmpp
-_turn._tcp              IN SRV      5 0 3478 xmpp
-_turn._tcp              IN SRV      5 1  443 xmpp
-_turn._udp              IN SRV      5 0 3478 xmpp
-_xmpp-client._tcp       IN SRV      5 0 5222 xmpp
-_xmpp-server._tcp       IN SRV      5 0 5269 xmpp
-_xmpps-client._tcp      IN SRV      5 0 5223 xmpp
-_xmpps-client._tcp      IN SRV      5 1  443 xmpp
-jabber                  IN SRV      5 0 5269 xmpp
-stun.tcp                IN SRV      5 0 3478 xmpp
-stun.udp                IN SRV      5 0 3478 xmpp
-turn.tcp                IN SRV      5 0 3478 xmpp
-turn.tcp                IN SRV      5 1  443 xmpp
-turn.udp                IN SRV      5 0 3478 xmpp
-xmpp-client.tcp         IN SRV      5 0 5222 xmpp
-xmpp-server.tcp         IN SRV      5 0 5269 xmpp
-xmpps-client.tcp        IN SRV      5 0 5223 xmpp
-xmpps-client.tcp        IN SRV      5 1  443 xmpp
+_jabber                 IN SRV      5 0 5269 xmpp.a-lec.org.
+_stun._tcp              IN SRV      5 0 3478 xmpp.a-lec.org.
+_stun._udp              IN SRV      5 0 3478 xmpp.a-lec.org.
+_turn._tcp              IN SRV      5 0 3478 xmpp.a-lec.org.
+_turn._tcp              IN SRV      5 1  443 xmpp.a-lec.org.
+_turn._udp              IN SRV      5 0 3478 xmpp.a-lec.org.
+_xmpp-client._tcp       IN SRV      5 0 5222 xmpp.a-lec.org.
+_xmpp-server._tcp       IN SRV      5 0 5269 xmpp.a-lec.org.
+_xmpps-client._tcp      IN SRV      5 0 5223 xmpp.a-lec.org.
+_xmpps-client._tcp      IN SRV      5 1  443 xmpp.a-lec.org.
+jabber                  IN SRV      5 0 5269 xmpp.a-lec.org.
+stun.tcp                IN SRV      5 0 3478 xmpp.a-lec.org.
+stun.udp                IN SRV      5 0 3478 xmpp.a-lec.org.
+turn.tcp                IN SRV      5 0 3478 xmpp.a-lec.org.
+turn.tcp                IN SRV      5 1  443 xmpp.a-lec.org.
+turn.udp                IN SRV      5 0 3478 xmpp.a-lec.org.
+xmpp-client.tcp         IN SRV      5 0 5222 xmpp.a-lec.org.
+xmpp-server.tcp         IN SRV      5 0 5269 xmpp.a-lec.org.
+xmpps-client.tcp        IN SRV      5 0 5223 xmpp.a-lec.org.
+xmpps-client.tcp        IN SRV      5 1  443 xmpp.a-lec.org.
 
 audio                   IN A        80.67.176.33
 audio                   IN AAAA     2001:910:1021::186