diff --git a/dockers/docker-fpm-frr/bgpd.peer.conf.j2 b/dockers/docker-fpm-frr/bgpd.peer.conf.j2
index 7dfdd50ea2c0..c3dc50449d35 100644
--- a/dockers/docker-fpm-frr/bgpd.peer.conf.j2
+++ b/dockers/docker-fpm-frr/bgpd.peer.conf.j2
@@ -24,6 +24,14 @@
 {% endif %}
 {% if bgp_session['nhopself'] | int != 0 %}
     neighbor {{ neighbor_addr }} next-hop-self
+{% endif %}
+{% if  bgp_session["asn"] == DEVICE_METADATA['localhost']['bgp_asn']
+   and DEVICE_METADATA['localhost']['type'] == "SpineChassisFrontendRouter"
+   and (not bgp_session.has_key("local_addr") or bgp_session["local_addr"] not in interfaces_in_vnets) %}
+  address-family l2vpn evpn
+    neighbor {{ neighbor_addr }} activate
+    advertise-all-vni
+  exit-address-family
 {% endif %}
     neighbor {{ neighbor_addr }} activate
   exit-address-family