diff --git a/config.yaml b/config.yaml
index 4012d97f..aba43f2b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -96,4 +96,10 @@ options:
       .
       This network will be used for tenant network traffic in overlay
       networks.
-
+  l2-population:
+    type: boolean
+    default: True
+    description: |
+      Populate the forwarding tables of virtual switches (LinuxBridge or OVS),
+      to decrease broadcast traffics inside the physical networks fabric while
+      using overlays networks (VXLan, GRE).
diff --git a/hooks/quantum_contexts.py b/hooks/quantum_contexts.py
index c13a8c2c..5aff6e18 100644
--- a/hooks/quantum_contexts.py
+++ b/hooks/quantum_contexts.py
@@ -172,7 +172,8 @@ class QuantumGatewayContext(OSContextGenerator):
             'plugin': config('plugin'),
             'debug': config('debug'),
             'verbose': config('verbose'),
-            'instance_mtu': config('instance-mtu')
+            'instance_mtu': config('instance-mtu'),
+            'l2_population': config('l2-population'),
         }
         return ctxt
 
diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
index 6d2fb816..61d64a85 100644
--- a/templates/icehouse/ml2_conf.ini
+++ b/templates/icehouse/ml2_conf.ini
@@ -15,5 +15,6 @@ enable_tunneling = True
 local_ip = {{ local_ip }}
 [agent]
 tunnel_types = gre
+l2_population = {{ l2_population }}
 [securitygroup]
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
diff --git a/unit_tests/test_quantum_contexts.py b/unit_tests/test_quantum_contexts.py
index 3a6b48cc..fde9f22b 100644
--- a/unit_tests/test_quantum_contexts.py
+++ b/unit_tests/test_quantum_contexts.py
@@ -209,7 +209,8 @@ class TestQuantumGatewayContext(CharmTestCase):
                            "OVSQuantumPluginV2",
             'plugin': 'ovs',
             'debug': False,
-            'verbose': True
+            'verbose': True,
+            'l2_population': True,
         })