diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
index 26c4f16a..0f3dd7a1 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -23,6 +23,8 @@
     - "{{master_certs_destination}}/{{kibana_node_name}}/{{ kibana_node_name }}.crt"
     - "{{master_certs_destination}}/ca/ca.crt"
   tags: xpack-security
+  when:
+    - elasticsearch_xpack_security
 
 - name: Ensuring certificates folder owner
   file:
diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml
index 0be4be83..59bc163c 100644
--- a/roles/wazuh/ansible-filebeat/tasks/main.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/main.yml
@@ -35,6 +35,9 @@
     - "{{master_certs_destination}}/{{filebeat_node_name}}/{{ filebeat_node_name }}.crt"
     - "{{master_certs_destination}}/ca/ca.crt"
   tags: xpack-security
+  when:
+    - elasticsearch_xpack_security
+
 
 - name: Ensuring certificates folder owner
   file: