diff --git a/roles/ndfc_common/vars/main.yml b/roles/ndfc_common/vars/main.yml
index be558d4..98b5cc7 100644
--- a/roles/ndfc_common/vars/main.yml
+++ b/roles/ndfc_common/vars/main.yml
@@ -447,6 +447,7 @@ vrfs:
     - ip_address: "{{ border_gateways[2].ip }}"
     - ip_address: "{{ border_gateways[3].ip }}"
 
+# VPC Peers
 vpc_peers:
 - fabric: "{{ fabrics[0].name}}"
   vpc_name: "vpc1"
@@ -466,64 +467,109 @@ vpc_peers:
   peer_1_ip: "{{ leafs[6].ip }}"
   peer_2_ip: "{{ leafs[7].ip }}"
 
+# VPC Interfaces
 vpc_interfaces:
 - fabric: "{{ fabrics[0].name}}"
   vpc_name: vpc1
   vpc_port_id: vpi11
   interface_mode: trunk
-  port_channel_mode: active
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true 
+  port_channel_mode: active 
+  peer1_allowed_vlans: 1111
+  peer2_allowed_vlans: 1111
   member_list:
   - Ethernet1/11
+
 - fabric: "{{ fabrics[0].name}}"
   vpc_name: vpc2
   vpc_port_id: vpi11
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1111
+  peer2_allowed_vlans: 1111
   member_list:
   - Ethernet1/11
-  port_channel_mode: active
 
 - fabric: "{{ fabrics[0].name}}"
   vpc_name: vpc1
   vpc_port_id: vpi12
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1112
+  peer2_allowed_vlans: 1112
   member_list:
   - Ethernet1/12
-  port_channel_mode: active
+
 - fabric: "{{ fabrics[0].name}}"
   vpc_name: vpc2
   vpc_port_id: vpi12
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1112
+  peer2_allowed_vlans: 1112
   member_list:
   - Ethernet1/12
-  port_channel_mode: active
 
 # f2
 - fabric: "{{ fabrics[1].name}}"
   vpc_name: vpc1
   vpc_port_id: vpi11
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
   port_channel_mode: active
+  peer1_allowed_vlans: 1111
+  peer2_allowed_vlans: 1111
   member_list:
   - Ethernet1/11
+
 - fabric: "{{ fabrics[1].name}}"
   vpc_name: vpc2
   vpc_port_id: vpi11
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1111
+  peer2_allowed_vlans: 1111
   member_list:
   - Ethernet1/11
-  port_channel_mode: active
 
 - fabric: "{{ fabrics[1].name}}"
   vpc_name: vpc1
   vpc_port_id: vpi12
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1112
+  peer2_allowed_vlans: 1112
   member_list:
   - Ethernet1/12
-  port_channel_mode: active
+
 - fabric: "{{ fabrics[1].name}}"
   vpc_name: vpc2
   vpc_port_id: vpi12
   interface_mode: trunk
+  mtu: jumbo
+  port_type_fast: true
+  bpdu_guard: true
+  port_channel_mode: active
+  peer1_allowed_vlans: 1112
+  peer2_allowed_vlans: 1112
   member_list:
   - Ethernet1/12
-  port_channel_mode: active
diff --git a/roles/ndfc_vpc_interface_merged_all/tasks/worker.yml b/roles/ndfc_vpc_interface_merged_all/tasks/worker.yml
index 253d793..9833012 100644
--- a/roles/ndfc_vpc_interface_merged_all/tasks/worker.yml
+++ b/roles/ndfc_vpc_interface_merged_all/tasks/worker.yml
@@ -69,10 +69,10 @@
           peer1_members: "{{ item.member_list }}"
           peer2_members: "{{ item.member_list }}"
           pc_mode: "{{ item.port_channel_mode }}"
-          bpdu_guard: true
-          port_type_fast: true
-          mtu: jumbo
-          peer1_allowed_vlans: all
-          peer2_allowed_vlans: all
-          peer1_description: "{{ item.vpc_port_id}} {{ item.interface_mode}}"
-          peer2_description: "{{ item.vpc_port_id}} {{ item.interface_mode}}"
+          bpdu_guard: "{{ item.bpdu_guard }}"
+          port_type_fast: "{{ item.port_type_fast }}"
+          mtu: "{{ item.mtu }}"
+          peer1_allowed_vlans: "{{ item.peer1_allowed_vlans }}"
+          peer2_allowed_vlans: "{{ item.peer2_allowed_vlans }}"
+          peer1_description: "{{ item.vpc_port_id }} {{ item.interface_mode }}"
+          peer2_description: "{{ item.vpc_port_id }} {{ item.interface_mode }}"