diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index cc643be11e..63b9af66fa 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -104,7 +104,7 @@ nova
 
 # Neutron
 [neutron-server:children]
-neutron
+control
 
 [neutron-agents:children]
 neutron
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index e7cc7b1916..080ee7dd4f 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -141,7 +141,7 @@
   template:
     src: "roles/neutron/templates/neutron-agents.json.j2"
     dest: "{{ node_config_directory }}/neutron-agents/config.json"
-  when: inventory_hostname in groups['neutron-server']
+  when: inventory_hostname in groups['neutron-agents']
 
 - name: Copying Neutron Server JSON configuration file
   template: