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..8252f7213 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
@@ -2,7 +2,7 @@
   OVERLAY_MODE: {{ vxlan.global.ibgp.overlay_mode | default(defaults.vxlan.global.ibgp.overlay_mode) }}
   GRFIELD_DEBUG_FLAG: Enable
   ENABLE_PVLAN: false
-  AAA_REMOTE_IP_ENABLED: False
+  AAA_REMOTE_IP_ENABLED: {{ vxlan.global.ibgp.enable_aaa_remote_ip | default(defaults.vxlan.global.ibgp.enable_aaa_remote_ip) }}
 {% if ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=') and ndfc_version | cisco.nac_dc_vxlan.version_compare('12.4.1', '<') %}
   ALLOW_L3VNI_NO_VLAN:  {{ vxlan.global.ibgp.enable_mvpn_vri_id_range | default(defaults.vxlan.global.ibgp.enable_mvpn_vri_id_range) }}
 {% endif %}
@@ -48,3 +48,10 @@
   STP_BRIDGE_PRIORITY: {{ vxlan.global.ibgp.spanning_tree.bridge_priority | default(defaults.vxlan.global.ibgp.spanning_tree.bridge_priority) }}
 {% endif %}
 {% endif %}
+  POWER_REDUNDANCY_MODE: {{ vxlan.global.ibgp.power_redundancy | default(defaults.vxlan.global.ibgp.power_redundancy) }}
+  COPP_POLICY: {{ vxlan.global.ibgp.copp_policy | default(defaults.vxlan.global.ibgp.copp_policy) }}
+  HD_TIME: {{ vxlan.global.ibgp.vtep_holddown_time | default(defaults.vxlan.global.ibgp.vtep_holddown_time) }}
+  ENABLE_NGOAM: {{ vxlan.global.ibgp.enable_ngoam | default(defaults.vxlan.global.ibgp.enable_ngoam) }}
+  ENABLE_TENANT_DHCP: {{ vxlan.global.ibgp.enable_tenant_dhcp | default(defaults.vxlan.global.ibgp.enable_tenant_dhcp) }}
+  STRICT_CC_MODE: {{ vxlan.global.ibgp.strict_config_compliance | default(defaults.vxlan.global.ibgp.strict_config_compliance) }}
+  ENABLE_DEFAULT_QUEUING_POLICY: {{ vxlan.global.ibgp.enable_default_queuing_policy | default(defaults.vxlan.global.ibgp.enable_default_queuing_policy) }}
diff --git a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2 b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2
index 6b6cf3fe5..59015f492 100644
--- a/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2
+++ b/roles/dtc/common/templates/ndfc_fabric/dc_vxlan_fabric/resources/dc_vxlan_fabric_resources.j2
@@ -76,3 +76,4 @@
 {% set l3_vlan_range = defaults.vxlan.global.ibgp.layer3_vlan_range.from ~ '-' ~ defaults.vxlan.global.ibgp.layer3_vlan_range.to %}
 {% endif %}
   VRF_VLAN_RANGE: {{ l3_vlan_range }}
+  SUBINTERFACE_RANGE: {{ vxlan.global.ibgp.sub_int_range | default(defaults.vxlan.global.ibgp.sub_int_range) }}
diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml
index e7be6bacb..8d25b3375 100644
--- a/roles/validate/files/defaults.yml
+++ b/roles/validate/files/defaults.yml
@@ -125,6 +125,15 @@ factory_defaults:
           enable_local_dhcp_server: false
           enable_cdp_mgmt: false
         tcam_allocation: true
+        power_redundancy: ps-redundant
+        copp_policy: strict
+        vtep_holddown_time: 180
+        enable_ngoam: true
+        enable_tenant_dhcp: true
+        strict_config_compliance: false
+        enable_aaa_remote_ip: false
+        enable_default_queuing_policy: false
+        sub_int_range: 2-511
       external:
         auth_proto: MD5
         enable_nxapi_http: false
@@ -478,4 +487,4 @@ factory_defaults:
         snmp_server_host_trap: true
         bootstrap:
           enable_bootstrap: false
-          enable_local_dhcp_server: false
+          enable_local_dhcp_server: false
\ No newline at end of file