diff --git a/zones/dns-witch.net.eu.org.zone b/zones/dns-witch.net.eu.org.zone
index d3d5cec..d83610c 100644
--- a/zones/dns-witch.net.eu.org.zone
+++ b/zones/dns-witch.net.eu.org.zone
@@ -17,3 +17,17 @@ ns2	IN 3600	  A   135.181.158.2
 @	IN 3600	  AAAA	 2a04:dd00:17:4:1::
 ns1	IN 3600	  AAAA	 2a04:dd00:17:4:1::
 ns2	IN 3600	  AAAA	 2a01:4f9:c010:ed58::1
+
+; SSH Fingerprints
+@	IN 3600   SSHFP 1 1 920b4c6503c2250c6d0a5870f914e1ab4f32818d
+@	IN 3600   SSHFP 1 2 31fc246dd56bb427f62c649148968966fb8751382ca751902023c6531982398d
+@	IN 3600   SSHFP 2 1 7ca3a21d2e716527a2dc122b87ef51a8087b1ba8
+@	IN 3600   SSHFP 2 2 44f6f1776c80c2f6a58a0ebc09ba8e4547526ac9b409551c3484f0e86add4deb
+@	IN 3600   SSHFP 3 1 14c2141c4bd9111d5ac03d35d45aa8b156edc178
+@	IN 3600   SSHFP 3 2 a8ff0f47c638923f898f291ab79822fae9be9f6d5ece7be3bed00541e50d2296
+@	IN 3600   SSHFP 4 1 dbe6aecb2fa82980adb1782ca050755644d7784e
+@	IN 3600   SSHFP 4 2 b67e17f38d9fe459a70055d3296e3fde0c92e7aed6a80146e2dbe22bf43abd69
+
+; Mails related records
+@       IN 3600   MX 10 mail.familier.net.eu.org.
+@       IN 3600   TXT "v=spf1 redirect=mail.familier.net.eu.org"
diff --git a/zones/familier.net.eu.org.zone b/zones/familier.net.eu.org.zone
index 46c8d36..d1c8a99 100644
--- a/zones/familier.net.eu.org.zone
+++ b/zones/familier.net.eu.org.zone
@@ -30,12 +30,12 @@ prometheus	3600 IN AAAA 2a01:4f9:c011:665::1
 ;prometheus  3600 IN CNAME familier.net.eu.org.
 
 ; SPF Records
-@	3600 IN	 TXT "v=spf1 mx ip4:65.21.49.125 -all"
-@	3600 IN	 TXT "v=spf1 mx ip6:2a01:4f9:c011:665::1 -all"
+@             3600 IN TXT "v=spf1 redirect=mail.familier.net.eu.org"
+mail.familier.net.eu.org.	3600 IN	 TXT "v=spf1 mx ip4:65.21.49.125 ip6:2a01:4f9:c011:665::1 -all"
 
 ; DKIM Records
 ; key#1 2048 bits, i=dkim, d=mail.familier.net.eu.org, /var/lib/dkim/mail.familier.net.eu.org.pem
-dkim._domainkey.familier.net.eu.org.       3600 TXT (
+dkim._domainkey.mail.familier.net.eu.org.       3600 TXT (
   "v=DKIM1; p="
   "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsT45xKKD7hV/ICcdLQ+H"
   "s+Hlegtjbqd83kayLqjEZthTm9hLvMZbxsvl2/9GKTCkjD8c5idcfgywPFHo9+43"
diff --git a/zones/grimoire.eu.org.zone b/zones/grimoire.eu.org.zone
index e5036df..1c602b3 100644
--- a/zones/grimoire.eu.org.zone
+++ b/zones/grimoire.eu.org.zone
@@ -13,3 +13,14 @@
 
 ; AAAA Records
 @	IN 3600	  AAAA	 2a01:4f9:c010:ed58::1
+
+; SSH Fingerprints
+@	IN 3600   SSHFP 1 1 a2c8eb7d4b2cd307ac6ca76fcb4cd5286c9a3d83
+@	IN 3600   SSHFP 1 2 2572e9e505f36f1e9ee2047bfbf1055d1ae833a047b232d763e15b07a97a97d2
+@	IN 3600   SSHFP 2 1 be8dac621ee9ff873c333256c11f49f58b753768
+@	IN 3600   SSHFP 2 2 4bf9594efa63463cfd2ae949c02c7b4143965297d9fe3974801b4cdf0935ae27
+@	IN 3600   SSHFP 3 1 91b72c62d2ab7772e59f624f75d4c7889475e748
+@	IN 3600   SSHFP 3 2 98a98344259defb6a1d122b962e99f0b2ed9084a43bf174d11ba8d99eed5348c
+@	IN 3600   SSHFP 4 1 38451fe7713678216dd0f27fa4e65bce5db92700
+@	IN 3600   SSHFP 4 2 c9031430fe877caf104ef51ccce2be53648c0b7ae9f15f3243a9c8d388e154f0
+