diff --git a/neutron/values.yaml b/neutron/values.yaml
index 71d66fcc93..a5e7e2c86d 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -297,8 +297,6 @@ conf:
       neutron:
         agent:
           root_helper: sudo /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
-          l2_population: True
-          arp_responder: True
     oslo_messaging_notifications:
       oslo:
         messaging:
@@ -389,6 +387,8 @@ conf:
           ovs:
             agent:
               tunnel_types: vxlan
+              l2_population: True
+              arp_responder: True
     ovs:
       neutron:
         ml2: