diff --git a/environments/neutron-ml2-ovn-ha.yaml b/environments/neutron-ml2-ovn-ha.yaml
index 843b414240..f5979c128d 100644
--- a/environments/neutron-ml2-ovn-ha.yaml
+++ b/environments/neutron-ml2-ovn-ha.yaml
@@ -21,7 +21,7 @@ parameter_defaults:
   OVNTunnelEncapType: geneve
   NeutronEnableDHCPAgent: false
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: 'geneve'
+  NeutronNetworkType: ['geneve', 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
 
diff --git a/environments/services-docker/neutron-ovn-ha.yaml b/environments/services-docker/neutron-ovn-ha.yaml
index aebf73bf0c..a97d29b7c9 100644
--- a/environments/services-docker/neutron-ovn-ha.yaml
+++ b/environments/services-docker/neutron-ovn-ha.yaml
@@ -21,7 +21,7 @@ parameter_defaults:
   OVNTunnelEncapType: geneve
   NeutronEnableDHCPAgent: false
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: 'geneve'
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronPluginExtensions: "qos,port_security,dns"
diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml
index cc50ddd58a..409b7332af 100644
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@@ -23,7 +23,7 @@ parameter_defaults:
   OVNTunnelEncapType: geneve
   NeutronEnableDHCPAgent: false
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: 'geneve'
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronEnableDVR: true
diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml
index 1224277476..03e2c6b081 100644
--- a/environments/services/neutron-ovn-ha.yaml
+++ b/environments/services/neutron-ovn-ha.yaml
@@ -21,7 +21,7 @@ parameter_defaults:
   OVNTunnelEncapType: geneve
   NeutronEnableDHCPAgent: false
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: 'geneve'
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronPluginExtensions: "qos,port_security,dns"
diff --git a/puppet/services/neutron-plugin-ml2-ovn.yaml b/puppet/services/neutron-plugin-ml2-ovn.yaml
index af02a4da90..cd8fb348fe 100644
--- a/puppet/services/neutron-plugin-ml2-ovn.yaml
+++ b/puppet/services/neutron-plugin-ml2-ovn.yaml
@@ -71,10 +71,7 @@ parameters:
     description: Whether Metadata Service has to be enabled
     type: boolean
     default: true
-  # NOTE(anil): OVN supports only VLAN and geneve networks. But VLAN
-  # tenant networks have a limited support in OVN. So allowing only
-  # geneve networks until the problems are addressed.
-  # See bug #1767070 for more information.
+  # NOTE(anil): OVN supports only VLAN, geneve and flat networks
   NeutronNetworkType:
     default: 'geneve'
     description: The tenant network type for Neutron.
@@ -82,6 +79,8 @@ parameters:
     constraints:
       - allowed_values:
           - geneve
+          - vlan
+          - flat
   OVNDnsServers:
     default: []
     description: List of servers to use as as dns forwarders
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 64b688cb90..2266e7fe8d 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -115,10 +115,10 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
                                                                'constraints'],
                                    # NOTE(anil): This is a temporary change and
                                    # will be removed once bug #1767070 properly
-                                   # fixed. OVN supports only VLAN and geneve
-                                   # for NeutronNetworkType. But VLAN tenant
-                                   # networks have a limited support in OVN.
-                                   # Till that is fixed, we restrict
+                                   # fixed. OVN supports only VLAN, geneve
+                                   # and flat for NeutronNetworkType. But VLAN
+                                   # tenant networks have a limited support
+                                   # in OVN. Till that is fixed, we restrict
                                    # NeutronNetworkType to 'geneve'.
                                    'NeutronNetworkType': ['description',
                                                           'default',