diff --git a/roles/leaf/templates/frr.conf.j2 b/roles/leaf/templates/frr.conf.j2
index a30748b..8349ee5 100644
--- a/roles/leaf/templates/frr.conf.j2
+++ b/roles/leaf/templates/frr.conf.j2
@@ -55,8 +55,8 @@ router bgp {{ asn.asn }}
 {% endfor %}
   address-family l2vpn evpn
     neighbor fabric activate
-{% for iface in ifaces_evpn|default([]) %}
-    neighbor {{ iface }} activate
+{% for iface in interfaces | selectattr('enabled') | selectattr('name', 'in', ifaces_evpn|default([])) %}
+    neighbor {{ iface.name }} activate
 {% endfor %}
 {% if peer is defined and  interfaces | selectattr('mode') %}
     advertise-all-vni