diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index a6835ac..772ecdf 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -27,6 +27,7 @@
 TUNNEL_INTERFACE_IP=$tunnel_interface_ip
 FRR_BGP_NEIGHBORS=$frr_bgp_neighbors
 FRR_EVPN_TUNNELS_RANGE=$frr_evpn_tunnels_range
+FRR_EVPN_VXLAN_DST_PORT=$frr_evpn_vxlan_dst_port
 TUNNEL_INTERFACE_NETWORK_NETMASK=$(ip -o addr show |grep -w ${TUNNEL_INTERFACE_IP} | awk '{print $4}' |awk -F '/' '{print $2}')
 TUNNEL_INTERFACE=$(ip -o addr show |grep -w ${TUNNEL_INTERFACE_IP}/${TUNNEL_INTERFACE_NETWORK_NETMASK} | awk '{print $2}')
 NODE_TYPE=$node_type
@@ -97,6 +98,7 @@
 FRR_BGP_SOURCE_ADDRESS=${TUNNEL_INTERFACE_IP}
 FRR_BGP_NEIGHBORS=${FRR_BGP_NEIGHBORS:-}
 FRR_EVPN_TUNNELS_RANGE=${FRR_EVPN_TUNNELS_RANGE:-'20 50'}
+FRR_EVPN_VXLAN_DST_PORT=${FRR_EVPN_VXLAN_DST_PORT:-4790}
 
 function retry {
     local retries=$1
@@ -710,7 +712,7 @@
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStart=/sbin/ip link add vxlan${vni} type vxlan id ${vni} local ${TUNNEL_INTERFACE_IP} nolearning
+ExecStart=/sbin/ip link add vxlan${vni} type vxlan id ${vni} local ${TUNNEL_INTERFACE_IP} nolearning dstport ${FRR_EVPN_VXLAN_DST_PORT}
 ExecStart=/sbin/ip link set vxlan${vni} up
 
 [Install]
@@ -747,12 +749,9 @@
  no bgp default ipv4-unicast
  bgp cluster-id ${FRR_ROUTER_ID}
  coalesce-time 1000
- neighbor fabric peer-group
- neighbor fabric remote-as ${FRR_BGP_AS_NUMBER}
- neighbor fabric update-source ${FRR_BGP_SOURCE_ADDRESS}
- neighbor fabric capability extended-nexthop
- bgp listen range 10.0.0.0/8 peer-group fabric
  neighbor rr peer-group
+ neighbor rr capability extended-nexthop
+ neighbor rr remote-as ${FRR_BGP_AS_NUMBER}
  neighbor rr update-source ${FRR_BGP_SOURCE_ADDRESS}
 EOF
 
@@ -765,17 +764,14 @@
     cat << EOF >> /etc/frr/frr.conf
  !
  address-family ipv4 unicast
-  neighbor fabric activate
   neighbor rr activate
  exit-address-family
  !
  address-family ipv4 vpn
-  neighbor fabric activate
   neighbor rr activate
  exit-address-family
  !
  address-family l2vpn evpn
-  neighbor fabric activate
   neighbor rr activate
   advertise-all-vni
   advertise-default-gw