diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 0e06750107..96dae79451 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -141,16 +141,10 @@ just set it along with nova_metadata_host.
 {{- end -}}
 
 {{- if empty $envAll.Values.conf.plugins.ml2_conf.ml2.mechanism_drivers -}}
-{{- $_ := set $envAll.Values "__mechanism_drivers" ( list "l2population" ) }}
-{{- if ( has "openvswitch" $envAll.Values.network.backend ) -}}
-{{ $__mechanism_drivers := append $envAll.Values.__mechanism_drivers "openvswitch" }}
-{{- $_ := set $envAll.Values "__mechanism_drivers" $__mechanism_drivers }}
+{{- if (contains "vxlan" $envAll.Values.conf.plugins.ml2_conf.ml2.tenant_network_types) -}}
+{{- $_ := set $envAll.Values "__mechanism_drivers" (append $envAll.Values.network.backend "l2population") -}}
 {{- end -}}
-{{- if ( has "linuxbridge" $envAll.Values.network.backend ) -}}
-{{ $__mechanism_drivers := append $envAll.Values.__mechanism_drivers "linuxbridge" }}
-{{- $_ := set $envAll.Values "__mechanism_drivers" $__mechanism_drivers }}
-{{- end -}}
-{{- $_ := set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" $envAll.Values.__mechanism_drivers -}}
+{{- $_ := set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" ($envAll.Values.__mechanism_drivers | default $envAll.Values.network.backend | uniq) -}}
 {{- end -}}
 
 {{- if empty .Values.conf.neutron.DEFAULT.bind_port -}}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index bdda754643..65a2a0ee9e 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -91,7 +91,6 @@ labels:
 
 network:
   # provide what type of network wiring will be used
-  # possible options: openvswitch, linuxbridge, sriov
   backend:
     - openvswitch
   # NOTE(Portdirect): Share network namespaces with the host,