diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml
index 470c08b406..590fb2fd52 100644
--- a/ansible/roles/baremetal/tasks/pre-install.yml
+++ b/ansible/roles/baremetal/tasks/pre-install.yml
@@ -116,9 +116,9 @@
   become: True
   when: ansible_os_family == 'RedHat'
 
-- name: Ensure /etc/kolla directory exists
+- name: Ensure node_config_directory directory exists
   file:
-    path: /etc/kolla
+    path: "{{ node_config_directory }}" 
     state: directory
     recurse: yes
     owner: kolla
@@ -127,9 +127,9 @@
   become: True
   when: create_kolla_user | bool
 
-- name: Ensure /etc/kolla directory exists
+- name: Ensure node_config_directory directory exists
   file:
-    path: /etc/kolla
+    path: "{{ node_config_directory }}"
     state: directory
     recurse: yes
     mode: 0666
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 7fbe2d82ae..e46049fb93 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -182,7 +182,7 @@
       service_name: "{{ item }}"
     sources:
       - "{{ role_path }}/templates/vpnaas_agent.ini.j2"
-      - "/etc/kolla/config/neutron/vpnaas_agent.ini"
+      - "{{ node_custom_config }}/neutron/vpnaas_agent.ini"
     dest: "{{ node_config_directory }}/{{ item }}/vpnaas_agent.ini"
   with_items:
     - "neutron-vpnaas-agent"