diff --git a/roles/elastic-stack/ansible-kibana/tasks/main.yml b/roles/elastic-stack/ansible-kibana/tasks/main.yml
index 0f3dd7a1..fe91221b 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/main.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/main.yml
@@ -24,7 +24,7 @@
     - "{{master_certs_destination}}/ca/ca.crt"
   tags: xpack-security
   when:
-    - elasticsearch_xpack_security
+    - kibana_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 59bc163c..2b566ed5 100644
--- a/roles/wazuh/ansible-filebeat/tasks/main.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/main.yml
@@ -36,7 +36,7 @@
     - "{{master_certs_destination}}/ca/ca.crt"
   tags: xpack-security
   when:
-    - elasticsearch_xpack_security
+    - filebeat_xpack_security
 
 
 - name: Ensuring certificates folder owner