diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2
index ccdf4256d..ef64e40cf 100644
--- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2
+++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/advanced/dc_vxlan_fabric_advanced.j2
@@ -48,3 +48,7 @@
   STP_BRIDGE_PRIORITY: {{ vxlan.global.ibgp.spanning_tree.bridge_priority | default(defaults.vxlan.global.ibgp.spanning_tree.bridge_priority) }}
 {% endif %}
 {% endif %}
+{% if vxlan.global.ibgp.intra_fabric_link_freeform is defined %}
+  EXTRA_CONF_INTRA_LINKS: |2
+    {{ vxlan.global.ibgp.intra_fabric_link_freeform | indent(4) }}
+{% endif %}
\ No newline at end of file
diff --git a/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2 b/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2
index 3428cbb45..8023dab7c 100644
--- a/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2
+++ b/roles/dtc/common/templates/ndfc_fabric/ebgp_vxlan_fabric/advanced/ebgp_vxlan_fabric_advanced.j2
@@ -27,3 +27,7 @@
 {% endif %}
 {% endif %}
 {% endif %}
+{% if vxlan.global.ebgp.intra_fabric_link_freeform is defined %}
+  EXTRA_CONF_INTRA_LINKS: |2
+    {{ vxlan.global.ebgp.intra_fabric_link_freeform | indent(4) }}
+{% endif %}
\ No newline at end of file