diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml
index 2b566ed5..a968e62d 100644
--- a/roles/wazuh/ansible-filebeat/tasks/main.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/main.yml
@@ -31,18 +31,32 @@
     src: "{{item}}"
     dest: "{{node_certs_destination}}/"
   with_items: 
-    - "{{master_certs_destination}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.key" 
-    - "{{master_certs_destination}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.crt"
-    - "{{master_certs_destination}}/ca/ca.crt"
-  tags: xpack-security
+    - "{{master_certs_path}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.key" 
+    - "{{master_certs_path}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.crt"
+    - "{{master_certs_path}}/ca/ca.crt"
   when:
+    - generate_CA
     - filebeat_xpack_security
+  tags: xpack-security
+  
+- name: Copying node's certificate from master (Custom CA)
+  copy:
+    src: "{{item}}"
+    dest: "{{node_certs_destination}}/"
+  with_items: 
+    - "{{master_certs_path}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.key" 
+    - "{{master_certs_path}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.crt"
+    - "{{master_certs_path}}/ca/{{ca_cert_name}}"
+  when:
+    - not generate_CA
+    - filebeat_xpack_security
+  tags: xpack-security
 
-
-- name: Ensuring certificates folder owner
+- name: Ensuring folder & certs permissions
   file:
     path: "{{ node_certs_destination }}/"
-    mode: '0770'
+    mode: '0774'
+    state: directory
     recurse: yes
   when:
     - filebeat_xpack_security