diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
index fe91221b..ada29886 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -19,12 +19,27 @@
     src: "{{item}}"
     dest: "{{node_certs_destination}}/"
   with_items: 
-    - "{{master_certs_destination}}/{{kibana_node_name}}/{{ kibana_node_name }}.key" 
-    - "{{master_certs_destination}}/{{kibana_node_name}}/{{ kibana_node_name }}.crt"
-    - "{{master_certs_destination}}/ca/ca.crt"
+    - "{{master_certs_path}}/{{kibana_node_name}}/{{ kibana_node_name }}.key" 
+    - "{{master_certs_path}}/{{kibana_node_name}}/{{ kibana_node_name }}.crt"
+    - "{{master_certs_path}}/ca/ca.crt"
   tags: xpack-security
   when:
     - kibana_xpack_security
+    - generate_CA
+
+- name: Copying node's certificate from master (Custom CA)
+  copy:
+    src: "{{item}}"
+    dest: "{{node_certs_destination}}/"
+    mode: '0664' 
+  with_items: 
+    - "{{master_certs_path}}/{{kibana_node_name}}/{{ kibana_node_name }}.key" 
+    - "{{master_certs_path}}/{{kibana_node_name}}/{{ kibana_node_name }}.crt"
+    - "{{master_certs_path}}/ca/{{ca_cert_name}}"
+  when:
+    - kibana_xpack_security
+    - not generate_CA
+  tags: xpack-security
 
 - name: Ensuring certificates folder owner
   file:
@@ -52,7 +67,7 @@
     dest: /etc/kibana/kibana.yml
     owner: root
     group: root
-    mode: 0664
+    mode: '0664' 
   notify: restart kibana
   tags: configure