diff --git a/ansible/roles/test/templates/vnet_config.j2 b/ansible/roles/test/templates/vnet_config.j2
index 45697bca5b1..ba62e04987d 100644
--- a/ansible/roles/test/templates/vnet_config.j2
+++ b/ansible/roles/test/templates/vnet_config.j2
@@ -1,9 +1,10 @@
 
-{% set vlan_id_list = [ 2001, 2002, 3001, 3002 ] %}
+{% set num_vnet = 8 %}
+{% set vlan_id_base = 3001 %}
 {% set topo_vlan = minigraph_vlans.keys()[0] %}
 {% set index = 10 %}
 vlan_intf_list:
-{% for vlan in vlan_id_list %}
+{% for vlan in range (vlan_id_base, vlan_id_base + num_vnet) %}
   - vlan_id: '{{ (vlan|int) }}'
     ifname: 'Vlan{{ vlan }}'
     ip: '{{ loop.index }}.{{ loop.index }}.10.1/24'
@@ -15,38 +16,35 @@ intf_list:
     ip: '{{ index }}.{{ index }}.10.1/24'
 
 vnet_id_list:
-  - Vnet1
-  - Vnet2
-  - Vnet3
-  - Vnet4
+{% for vnet in range (1, 1 + num_vnet) %}
+  - Vnet{{ vnet }}
+{% endfor %}
 
 vnet_peer_list:
   - Vnet3: Vnet4
   - Vnet4: Vnet3
+  - Vnet7: Vnet8
+  - Vnet8: Vnet7
 
 vnet_intf_list:
-  - ifname: Vlan2001
-    vnet: Vnet1
-  - ifname: Vlan2002
-    vnet: Vnet2
-  - ifname: Vlan3001
-    vnet: Vnet3
-  - ifname: Vlan3002
-    vnet: Vnet4
+{% for vlan in range (vlan_id_base, vlan_id_base + num_vnet) %}
+  - ifname: Vlan{{ vlan }}
+    vnet: Vnet{{ loop.index }}
+{% endfor %}
 
 vnet_nbr_list:
-  - ifname: Vlan2001
-    ip: '1.1.10.101'
-  - ifname: Vlan2001
-    ip: '1.1.10.102'
-  - ifname: Vlan2002
-    ip: '2.2.10.101'
-  - ifname: Vlan2002
-    ip: '2.2.10.102'
+{% for vlan in range (vlan_id_base, vlan_id_base + num_vnet) %}
+  - ifname: Vlan{{ vlan }}
+    ip: '{{ loop.index }}.{{ loop.index }}.10.101'
+{% endfor %}
   - ifname: Vlan3001
-    ip: '3.3.10.101'
+    ip: '1.1.10.102'
   - ifname: Vlan3002
-    ip: '4.4.10.101'
+    ip: '2.2.10.102'
+  - ifname: Vlan3005
+    ip: '5.5.10.102'
+  - ifname: Vlan3006
+    ip: '6.6.10.102'
   - ifname: {{ minigraph_vlans[topo_vlan].members[0] }}
     ip: '10.10.10.102'
 
@@ -54,14 +52,14 @@ vnet_local_routes:
   - Vnet1_route_list:
       - pfx: '50.1.1.0/24'
         nh: '1.1.10.101'
-        ifname: 'Vlan2001'
+        ifname: 'Vlan3001'
       - pfx: '50.2.2.0/24'
         nh: '1.1.10.102'
-        ifname: 'Vlan2001'
+        ifname: 'Vlan3001'
   - Vnet2_route_list:
       - pfx: '60.1.1.0/24'
         nh: '2.2.10.101'
-        ifname: 'Vlan2002'
+        ifname: 'Vlan3002'
 
 vnet_route_list:
   - Vnet1_route_list: