diff --git a/roles/cfg-evpn/tasks/nxos.yml b/roles/cfg-evpn/tasks/nxos.yml
index 8f07e8d..4ad009d 100644
--- a/roles/cfg-evpn/tasks/nxos.yml
+++ b/roles/cfg-evpn/tasks/nxos.yml
@@ -5,11 +5,8 @@
     config: |
       router bgp {{ ibgp_asn }}
          log-neighbor-changes
-         !
-         ! The next two lines needed only for vPC Fabric peering
-         ! address-family l2vpn evpn
-         !  advertise-pip
-         !
+         address-family l2vpn evpn
+           advertise-pip
          template peer VXLAN_SPINE
            remote-as {{ ibgp_asn }}
            update-source loopback0
@@ -50,10 +47,8 @@
   connection: network_cli
   cli_config:
     config: |
-      ip prefix-list ATTACHED_SVIS seq 10 permit 172.16.0.0/16 ge 24
-      !
       route-map ADV_SVIS permit 10
-        match ip address prefix-list ATTACHED_SVIS
+        match tag 12345
 
 - name: Advertise L3 GW address (NXOS)                                                                  
   connection: network_cli                          
diff --git a/roles/cfg-server-ports/tasks/nxos.yml b/roles/cfg-server-ports/tasks/nxos.yml
index c03e7b9..93e90da 100644
--- a/roles/cfg-server-ports/tasks/nxos.yml
+++ b/roles/cfg-server-ports/tasks/nxos.yml
@@ -16,7 +16,7 @@
      interface {{ l2_networks[item.vlanid].vlanif }}
        no shutdown
        mtu 9000
-       ip address {{ l2_networks[item.vlanid].ip_address }}
+       ip address {{ l2_networks[item.vlanid].ip_address }} tag 12345
 
   with_items: "{{ l2_ports[ansible_network_os] }}"
 
diff --git a/roles/cfg-vxlan/tasks/nxos.yml b/roles/cfg-vxlan/tasks/nxos.yml
index 546af10..2b8f777 100644
--- a/roles/cfg-vxlan/tasks/nxos.yml
+++ b/roles/cfg-vxlan/tasks/nxos.yml
@@ -7,6 +7,7 @@
         no shutdown
         advertise virtual-rmac
         host-reachability protocol bgp
+        global suppress-arp
         source-interface {{ vtep_iface }}
   when: inventory_hostname not in groups['spine']
   tags: vxlan
@@ -18,13 +19,6 @@
       fabric forwarding anycast-gateway-mac {{ nxos_fabric_anycast_gw_mac }}
   when: inventory_hostname not in groups['spine']
 
-- name: Reconfigure access-list for arp suppression (NXOS)
-  connection: network_cli
-  cli_config:
-    config: |
-      hardware access-list tcam region vpc-convergence 0
-      hardware access-list tcam region arp-ether 256
-
 - name: Configure VNIs with mcast (NXOS)
   connection: network_cli
   cli_config: 
@@ -35,7 +29,6 @@
      interface nve1
        !
        member vni {{ l2_networks[item.vlanid].vnid }}
-         suppress-arp
          mcast-group {{ item.mcast_grp }}
 
   with_items: "{{ l2_ports[ansible_network_os] }}"
@@ -49,10 +42,9 @@
        vn-segment {{ l2_networks[item.vlanid].vnid }}
 
      interface nve1
+       global ingress-replication protocol bvp
        !
        member vni {{ l2_networks[item.vlanid].vnid }}
-         suppress-arp
-         ingress-replication protocol bgp
 
   with_items: "{{ l2_ports[ansible_network_os] }}"
   when: l2_ports is defined and replication != 'mcast'
@@ -86,9 +78,10 @@
     config: |
       int Vlan{{ item.vlanid }}
         vrf member {{ l2_networks[item.vlanid].vrf }}
-        no shut
-        ip address {{ l2_networks[item.vlanid].ip_address }}
+        ip address {{ l2_networks[item.vlanid].ip_address }} tag 12345
+        ! mtu 9000 should not be a must.
         mtu 9000
         fabric forwarding mode anycast-gateway
+        no shut
   with_items: "{{ l2_ports[ansible_network_os] }}"
   when: l2_ports is defined