diff --git a/elements/neutron/os-apply-config/etc/neutron/neutron.conf b/elements/neutron/os-apply-config/etc/neutron/neutron.conf
index f379089e4..2920c0e1e 100644
--- a/elements/neutron/os-apply-config/etc/neutron/neutron.conf
+++ b/elements/neutron/os-apply-config/etc/neutron/neutron.conf
@@ -77,7 +77,12 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
 
 notification_topics = notifications
 
-dhcp_agents_per_network = 2
+{{#neutron.dhcp_agents_per_network}}
+dhcp_agents_per_network = {{neutron.dhcp_agents_per_network}}
+{{/neutron.dhcp_agents_per_network}}
+{{^neutron.dhcp_agents_per_network}}
+dhcp_agents_per_network = 3
+{{/neutron.dhcp_agents_per_network}}
 
 {{#neutron.router_distributed}}
 router_distributed = {{neutron.router_distributed}}