diff --git a/templates/havana/dhcp_agent.ini b/templates/havana/dhcp_agent.ini
index 0a2699f3..1a31a337 100644
--- a/templates/havana/dhcp_agent.ini
+++ b/templates/havana/dhcp_agent.ini
@@ -3,8 +3,8 @@ state_path = /var/lib/neutron
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
-{% if plugin == 'nvp' %}
 ovs_use_veth = True
+{% if plugin == 'nvp' %}
 enable_metadata_network = True
 enable_isolated_metadata = True
 {% endif %}
diff --git a/templates/havana/l3_agent.ini b/templates/havana/l3_agent.ini
index 1eb6ffd0..8a533270 100644
--- a/templates/havana/l3_agent.ini
+++ b/templates/havana/l3_agent.ini
@@ -6,3 +6,4 @@ admin_tenant_name = {{ service_tenant }}
 admin_user = {{ service_username }}
 admin_password = {{ service_password }}
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ovs_use_veth = True