diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
index 948cf52cf9..282059398f 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
@@ -1180,8 +1180,6 @@ data:
           metadata_port: 80
       plugins:
         ml2_conf:
-          ml2_type_flat:
-            flat_networks: public
           ml2:
             mechanism_drivers: openvswitch,sriovnicswitch,l2population
             path_mtu: 0
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
index 0345535065..39d355e83a 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
@@ -334,11 +334,22 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
 
         return ",".join(ml2_physical_network_mtus)
 
+    def _get_flat_networks(self):
+        flat_nets = []
+        datanetworks = self.dbapi.datanetworks_get_all()
+        for datanetwork in datanetworks:
+            if datanetwork.network_type == constants.DATANETWORK_TYPE_FLAT:
+                flat_nets.append(str(datanetwork.name))
+        return ",".join(flat_nets)
+
     def _get_neutron_ml2_config(self):
         ml2_config = {
             'ml2': {
                 'physical_network_mtus': self._get_ml2_physical_network_mtus()
             },
+            'ml2_type_flat': {
+                'flat_networks': self._get_flat_networks()
+            }
         }
         LOG.info("_get_neutron_ml2_config=%s" % ml2_config)
         return ml2_config