diff --git a/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ebgp.j2 b/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ebgp.j2
index da0b14313..fe3cd8d93 100644
--- a/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ebgp.j2
+++ b/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ebgp.j2
@@ -49,7 +49,7 @@
     {% if switch_redist.source == 'static' and switch_redist.route_map_ipv4 %}
     redistribute static route-map {{ switch_redist.route_map_ipv4 }}
     {% endif %}
-    {% if switch_redist.source == 'ospf' and switch_redist.route_map_ipv4 %}
+    {% if switch_redist.source == 'ospf' and switch_redist.route_map_ipv4 and switch_redist.protocol_tag %}
     redistribute ospf {{ switch_redist.protocol_tag }} route-map {{ switch_redist.route_map_ipv4 }}
     {% endif %}
   {% endfor %}
diff --git a/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ospf.j2 b/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ospf.j2
index 0a7971605..ab5d80ac0 100644
--- a/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ospf.j2
+++ b/roles/dtc/common/templates/ndfc_vrf_lite/ndfc_vrf_lite_ospf.j2
@@ -143,7 +143,7 @@ router ospf {{ item.ospf['process'] }}
     {% endif %}
     {% if item.ospf.areas %}
       {% for area in item.ospf.areas %}
-    {{- render_ospf_area(area, defaults) -}}
+    {{- render_ospf_area(area, defaults) | indent(2) -}}
       {% endfor %}
     {% endif %}
     {% if (item.ospf.distance and item.ospf.distance != 110) or (item.ospf.distance is not defined and defaults.vxlan.overlay_extensions.vrf_lites.ospf.distance != 110) %}
diff --git a/roles/validate/files/rules/ibgp_vxlan/502_policy_vrf_lite_cross_reference.py b/roles/validate/files/rules/ibgp_vxlan/502_policy_vrf_lite_cross_reference.py
index f89ad55b7..453ea91c5 100644
--- a/roles/validate/files/rules/ibgp_vxlan/502_policy_vrf_lite_cross_reference.py
+++ b/roles/validate/files/rules/ibgp_vxlan/502_policy_vrf_lite_cross_reference.py
@@ -114,7 +114,7 @@ def check_global_ospf_area(cls, policy):
         """
         Check OSPF if backbone area is standard
         """
-        if policy.get("ospf") and not policy["ospf"].get("areas"):
+        if policy.get("ospf") and policy["ospf"].get("areas"):
             for area in policy["ospf"]["areas"]:
                 if "id" in area and area.get("area_type"):
                     # Check if AREA 0 is not standard