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 ccdf4256..41e9f257 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
@@ -1,6 +1,6 @@
 {# Auto-generated NDFC DC VXLAN EVPN Advanced config data structure for fabric {{ vxlan.fabric.name }} #}
   OVERLAY_MODE: {{ vxlan.global.ibgp.overlay_mode | default(defaults.vxlan.global.ibgp.overlay_mode) }}
-  GRFIELD_DEBUG_FLAG: Enable
+  GRFIELD_DEBUG_FLAG: {{ vxlan.global.ibgp.greenfield_cleanup | default(defaults.vxlan.global.ibgp.greenfield_cleanup) }}
   ENABLE_PVLAN: false
   AAA_REMOTE_IP_ENABLED: False
 {% if ndfc_version | cisco.nac_dc_vxlan.version_compare('12.2.2', '>=') and ndfc_version | cisco.nac_dc_vxlan.version_compare('12.4.1', '<') %}
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 3428cbb4..8cf8eadc 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
@@ -1,5 +1,5 @@
 {# Auto-generated NDFC eBGP VXLAN EVPN Advanced config data structure for fabric {{ vxlan.fabric.name }} #}
-  GRFIELD_DEBUG_FLAG: Enable
+  GRFIELD_DEBUG_FLAG: {{ vxlan.global.ebgp.greenfield_cleanup | default(defaults.vxlan.global.ebgp.greenfield_cleanup) }}
   ENABLE_PVLAN: false
   AAA_REMOTE_IP_ENABLED: False
   FABRIC_MTU: {{ vxlan.underlay.general.intra_fabric_interface_mtu | default(defaults.vxlan.underlay.general.intra_fabric_interface_mtu) }}
diff --git a/roles/validate/files/defaults.yml b/roles/validate/files/defaults.yml
index 3856e9cd..5749f322 100644
--- a/roles/validate/files/defaults.yml
+++ b/roles/validate/files/defaults.yml
@@ -33,6 +33,7 @@ factory_defaults:
         enable_nxapi_https: true
         nxapi_https_port: 443
         overlay_mode: cli
+        greenfield_cleanup: Disable
         layer2_vni_range:
           from: 30000
           to: 49000
@@ -80,6 +81,7 @@ factory_defaults:
         enable_nxapi_https: true
         nxapi_https_port: 443
         overlay_mode: cli
+        greenfield_cleanup: Disable
         layer2_vni_range:
           from: 30000
           to: 49000