diff --git a/roles/leaf/templates/frr.conf.j2 b/roles/leaf/templates/frr.conf.j2
index 2510328..a30748b 100644
--- a/roles/leaf/templates/frr.conf.j2
+++ b/roles/leaf/templates/frr.conf.j2
@@ -41,7 +41,8 @@ router bgp {{ asn.asn }}
 {% endfor %}
 
 {% endfor %}
-  address-family ipv4 unicast
+{% for family in ['ipv4', 'ipv6'] %}
+  address-family {{ family }} unicast
     redistribute connected route-map loopbacks
     neighbor fabric activate
 {% for tenant in my_tenants %}
@@ -51,16 +52,7 @@ router bgp {{ asn.asn }}
 {% endfor %}
   exit-address-family
 
-  address-family ipv6 unicast
-    redistribute connected route-map loopbacks
-    neighbor fabric activate
-{% for tenant in my_tenants %}
-    neighbor dc-{{ tenant }} activate
-    neighbor dc-{{ tenant }} route-map dc-{{ tenant }}->default in
-    neighbor dc-{{ tenant }} route-map default->dc out
 {% endfor %}
-  exit-address-family
-
   address-family l2vpn evpn
     neighbor fabric activate
 {% for iface in ifaces_evpn|default([]) %}