diff --git a/group_vars/keepalived.yml b/group_vars/keepalived.yml
index 24031664..b23cf6ad 100644
--- a/group_vars/keepalived.yml
+++ b/group_vars/keepalived.yml
@@ -2,7 +2,7 @@
 glob_keepalived:
   mail_source: keepalived@crans.org
   mail_destination: root@crans.org
-  smtp_server: smtp.adm.crans.org
+  smtp_server: "{{ query('ldap', 'ip', 'redisdead', 'adm') | ipv4 | first }}"
   routeur_id: "{{ ansible_hostname }}"
   pool:
     VI_ALL:
@@ -15,16 +15,23 @@ glob_keepalived:
           ipv4: 138.195.159.250/30
         - vlan: aurore
           ipv4: 185.230.79.253/29
-          ipv6: 2a0c:700:28::1/64
+          ipv6:
+            - {ip: '2a0c:700:28::1/64', scope: 'global'}
         - vlan: srv
           ipv4: 185.230.79.62/26
-          ipv6: 2a0c:700:2::ff:fe00:9902/64
+          ipv6:
+            - {ip: '2a0c:700:2::ff:fe00:9902/64', scope: 'global'}
+            - {ip: 'fe80::1/64', scope: 'link'}
         - vlan: srv_nat
           ipv4: 172.16.3.99/24
-          ipv6: 2a0c:700:3::ff:fe00:9903/64
+          ipv6:
+            - {ip: '2a0c:700:3::ff:fe00:9903/64', scope: 'global'}
+            - {ip: 'fe80::1/64', scope: 'link'}
         - vlan: adh
           ipv4: 185.230.78.99/24
-          ipv6: 2a0c:700:12::ff:fe00:9912/48
+          ipv6:
+            - {ip: '2a0c:700:12::ff:fe00:9912/48', scope: 'global'}
+            - {ip: 'fe80::1/64', scope: 'link'}
         - vlan: ens
           ipv4: 100.84.0.99/16
           ipv6: 2a0c:700:54::ff:fe00:9954/48
diff --git a/host_vars/routeur-daniel.adm.crans.org/keepalived.yml b/host_vars/routeur-daniel.adm.crans.org/keepalived.yml
index 783f66ed..4da57609 100644
--- a/host_vars/routeur-daniel.adm.crans.org/keepalived.yml
+++ b/host_vars/routeur-daniel.adm.crans.org/keepalived.yml
@@ -16,3 +16,4 @@ loc_service_keepalived:
         - radvd
         - bird
         - bird6
+        - router.target
diff --git a/host_vars/routeur-jack.adm.crans.org/keepalived.yml b/host_vars/routeur-jack.adm.crans.org/keepalived.yml
index 654315aa..333604bf 100644
--- a/host_vars/routeur-jack.adm.crans.org/keepalived.yml
+++ b/host_vars/routeur-jack.adm.crans.org/keepalived.yml
@@ -16,3 +16,4 @@ loc_service_keepalived:
         - radvd
         - bird
         - bird6
+        - router.target
diff --git a/host_vars/routeur-sam.adm.crans.org/keepalived.yml b/host_vars/routeur-sam.adm.crans.org/keepalived.yml
index 917ba07f..d18dbf39 100644
--- a/host_vars/routeur-sam.adm.crans.org/keepalived.yml
+++ b/host_vars/routeur-sam.adm.crans.org/keepalived.yml
@@ -16,3 +16,4 @@ loc_service_keepalived:
         - radvd
         - bird
         - bird6
+        - router.target
diff --git a/roles/keepalived/templates/keepalived/keepalived.conf.j2 b/roles/keepalived/templates/keepalived/keepalived.conf.j2
index 5bde7f18..3a1e5f95 100644
--- a/roles/keepalived/templates/keepalived/keepalived.conf.j2
+++ b/roles/keepalived/templates/keepalived/keepalived.conf.j2
@@ -45,7 +45,9 @@ vrrp_instance {{ instance.name }}6 {
   virtual_ipaddress {
 {% for zone in keepalived.pool[instance.name].zones %}
 {% if zone.ipv6 is defined %}
-      {{ zone.ipv6 }} dev {{ interfaces[zone.vlan] }} scope global
+{% for ip in zone.ipv6 %}
+      {{ ip.ip }} dev {{ interfaces[zone.vlan] }} scope {{ ip.scope }}
+{% endfor %}
 {% endif %}
 {% endfor %}
   }