diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index bc18d03808..a2e7d08fa0 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -116,6 +116,7 @@
     sources:
       - "{{ role_path }}/templates/dhcp_agent.ini.j2"
       - "{{ node_custom_config }}/neutron/dhcp_agent.ini"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dhcp_agent.ini"
     dest: "{{ node_config_directory }}/{{ item }}/dhcp_agent.ini"
   with_items:
     - "neutron-dhcp-agent"
@@ -134,6 +135,7 @@
     sources:
       - "{{ role_path }}/templates/l3_agent.ini.j2"
       - "{{ node_custom_config }}/neutron/l3_agent.ini"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/l3_agent.ini"
     dest: "{{ node_config_directory }}/{{ item }}/l3_agent.ini"
   with_items:
     - "neutron-l3-agent"