diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml
index 471e414a77..9c9bd60fd7 100644
--- a/ansible/roles/karbor/tasks/config.yml
+++ b/ansible/roles/karbor/tasks/config.yml
@@ -29,12 +29,12 @@
       service_name: "{{ item.key }}"
     sources:
       - "{{ role_path }}/templates/karbor.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/karbor.conf"
-      - "{{ node_config_directory }}/config/karbor/{{ item.key }}.conf"
-      - "{{ node_config_directory }}/config/karbor/{{ inventory_hostname }}/karbor.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/karbor.conf"
+      - "{{ node_custom_config }}/karbor/{{ item.key }}.conf"
+      - "{{ node_custom_config }}/karbor/{{ inventory_hostname }}/karbor.conf"
     dest: "{{ node_config_directory }}/{{ item.key }}/karbor.conf"
   register: karbor_confs
   when:
diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml
index 725703f72a..392863d1b5 100644
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@@ -22,12 +22,12 @@
       service_name: "{{ item }}"
     sources:
       - "{{ role_path }}/templates/murano.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/murano.conf"
-      - "{{ node_config_directory }}/config/murano/{{ item }}.conf"
-      - "{{ node_config_directory }}/config/murano/{{ inventory_hostname }}/murano.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/murano.conf"
+      - "{{ node_custom_config }}/murano/{{ item }}.conf"
+      - "{{ node_custom_config }}/murano/{{ inventory_hostname }}/murano.conf"
     dest: "{{ node_config_directory }}/{{ item }}/murano.conf"
   with_items:
     - "murano-api"
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 396f7db058..b8d6128d18 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -23,12 +23,12 @@
       service_name: "{{ item }}"
     sources:
       - "{{ role_path }}/templates/neutron.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/neutron.conf"
-      - "{{ node_config_directory }}/config/neutron/{{ item }}.conf"
-      - "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/neutron.conf"
+      - "{{ node_custom_config }}/neutron/{{ item }}.conf"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
     dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf"
   register: fake_neutron_conf
   with_sequence: start=1 end={{ num_nova_fake_per_node }}
@@ -42,8 +42,8 @@
       service_name: "{{ item }}"
     sources:
       - "{{ role_path }}/templates/ml2_conf.ini.j2"
-      - "{{ node_config_directory }}/config/neutron/ml2_conf.ini"
-      - "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf"
+      - "{{ node_custom_config }}/neutron/ml2_conf.ini"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
     dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini"
   register: fake_neutron_ml2_conf_ini
   with_sequence: start=1 end={{ num_nova_fake_per_node }}
diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml
index cb4909be17..099b7fe944 100644
--- a/ansible/roles/nova/tasks/config-nova-fake.yml
+++ b/ansible/roles/nova/tasks/config-nova-fake.yml
@@ -22,12 +22,12 @@
       service_name: "{{ item }}"
     sources:
       - "{{ role_path }}/templates/nova.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/nova.conf"
-      - "{{ node_config_directory }}/config/nova/{{ item }}.conf"
-      - "{{ node_config_directory }}/config/nova/{{ inventory_hostname }}/nova.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/nova.conf"
+      - "{{ node_custom_config }}/nova/{{ item }}.conf"
+      - "{{ node_custom_config }}/nova/{{ inventory_hostname }}/nova.conf"
     dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/nova.conf"
   with_sequence: start=1 end={{ num_nova_fake_per_node }}
   notify:
diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml
index 0f76250b00..74ad142a83 100644
--- a/ansible/roles/octavia/tasks/config.yml
+++ b/ansible/roles/octavia/tasks/config.yml
@@ -27,12 +27,12 @@
       service_name: "{{ item.key }}"
     sources:
       - "{{ role_path }}/templates/octavia.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/octavia.conf"
-      - "{{ node_config_directory }}/config/octavia/{{ item.key }}.conf"
-      - "{{ node_config_directory }}/config/octavia/{{ inventory_hostname }}/octavia.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/octavia.conf"
+      - "{{ node_custom_config }}/octavia/{{ item.key }}.conf"
+      - "{{ node_custom_config }}/octavia/{{ inventory_hostname }}/octavia.conf"
     dest: "{{ node_config_directory }}/{{ item.key }}/octavia.conf"
   register: octavia_confs
   when:
@@ -46,7 +46,7 @@
   vars:
     service: "{{ octavia_services['octavia-worker'] }}"
   copy:
-    src: "{{ node_config_directory }}/config/octavia/{{ item }}"
+    src: "{{ node_custom_config }}/octavia/{{ item }}"
     dest: "{{ node_config_directory }}/octavia-worker/{{ item }}"
   register: octavia_worker_certificate
   when:
diff --git a/ansible/roles/solum/tasks/config.yml b/ansible/roles/solum/tasks/config.yml
index 3612fa59bf..28e097a393 100644
--- a/ansible/roles/solum/tasks/config.yml
+++ b/ansible/roles/solum/tasks/config.yml
@@ -30,12 +30,12 @@
       service_name: "{{ item.key }}"
     sources:
       - "{{ role_path }}/templates/solum.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/solum.conf"
-      - "{{ node_config_directory }}/config/solum/{{ item.key }}.conf"
-      - "{{ node_config_directory }}/config/solum/{{ inventory_hostname }}/solum.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/solum.conf"
+      - "{{ node_custom_config }}/solum/{{ item.key }}.conf"
+      - "{{ node_custom_config }}/solum/{{ inventory_hostname }}/solum.conf"
     dest: "{{ node_config_directory }}/{{ item.key }}/solum.conf"
   register: solum_confs
   when:
diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml
index f86b7acb6d..5037c87467 100644
--- a/ansible/roles/watcher/tasks/config.yml
+++ b/ansible/roles/watcher/tasks/config.yml
@@ -29,12 +29,12 @@
       service_name: "{{ item.key }}"
     sources:
       - "{{ role_path }}/templates/watcher.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/watcher.conf"
-      - "{{ node_config_directory }}/config/watcher/{{ item.key }}.conf"
-      - "{{ node_config_directory }}/config/watcher/{{ inventory_hostname }}/watcher.conf"
+      - "{{ node_custom_config }}/global.conf"
+      - "{{ node_custom_config }}/database.conf"
+      - "{{ node_custom_config }}/messaging.conf"
+      - "{{ node_custom_config }}/watcher.conf"
+      - "{{ node_custom_config }}/watcher/{{ item.key }}.conf"
+      - "{{ node_custom_config }}/watcher/{{ inventory_hostname }}/watcher.conf"
     dest: "{{ node_config_directory }}/{{ item.key }}/watcher.conf"
   register: watcher_confs
   when: