diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
index 1a737c04..50b56d5c 100644
--- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
@@ -11,7 +11,7 @@ elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'
   yum: 'https://artifacts.elastic.co/packages/7.x/yum'
   gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
-  kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
+  key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
 
 # Cluster Settings
 single_node: true
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index cfdbe342..74c6bcf2 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -31,7 +31,7 @@
 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
   apt_key:
     url: "{{ elasticrepo.gpg }}"
-    id: "{{ elasticrepo.kid }}"
+    id: "{{ elasticrepo.key_id }}"
     state: present
 
 - name: Debian/Ubuntu | Install Elastic repo
diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml
index 07675f85..10408e77 100644
--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@@ -13,7 +13,7 @@ elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'
   yum: 'https://artifacts.elastic.co/packages/7.x/yum'
   gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
-  kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
+  key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
 
 # API credentials
 wazuh_api_credentials:
diff --git a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
index ff4373dc..281555ca 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
@@ -11,7 +11,7 @@
 - name: Debian/Ubuntu | Add Elasticsearch GPG key
   apt_key:
     url: "{{ elasticrepo.gpg }}"
-    id: "{{ elasticrepo.kid }}"
+    id: "{{ elasticrepo.key_id }}"
     state: present
 
 - name: Debian/Ubuntu | Install Elastic repo
diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml
index 5b655311..d7bdcf02 100644
--- a/roles/wazuh/ansible-filebeat/defaults/main.yml
+++ b/roles/wazuh/ansible-filebeat/defaults/main.yml
@@ -54,4 +54,4 @@ elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'
   yum: 'https://artifacts.elastic.co/packages/7.x/yum'
   gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
-  kid: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
+  key_id: '46095ACC8548582C1A2699A9D27D666CD88E42B4'
diff --git a/roles/wazuh/ansible-filebeat/tasks/Debian.yml b/roles/wazuh/ansible-filebeat/tasks/Debian.yml
index bdd7dc51..a87bb2bf 100644
--- a/roles/wazuh/ansible-filebeat/tasks/Debian.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/Debian.yml
@@ -11,7 +11,7 @@
 - name: Debian/Ubuntu | Add Elasticsearch apt key.
   apt_key:
     url: "{{ elasticrepo.gpg }}"
-    id: "{{ elasticrepo.kid }}"
+    id: "{{ elasticrepo.key_id }}"
     state: present
 
 - name: Debian/Ubuntu | Add Filebeat repository.
diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index d92b07b4..d1c027ad 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -60,7 +60,7 @@ wazuh_agent_config:
     apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
     yum: 'https://packages.wazuh.com/3.x/yum/'
     gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
-    kid: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
+    key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
   active_response:
     ar_disabled: 'no'
     ca_store: '/var/ossec/etc/wpk_root.pem'
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
index 452fbdf8..88b9895c 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
@@ -25,7 +25,7 @@
 - name: Debian/Ubuntu | Installing Wazuh repository key
   apt_key:
     url: "{{ wazuh_agent_config.repo.gpg }}"
-    id: "{{ wazuhrepo.kid }}"
+    id: "{{ wazuhrepo.key_id }}"
   when:
     - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
     - not wazuh_agent_sources_installation.enabled
diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index fadc54f9..ce84fa80 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -52,7 +52,7 @@ wazuh_manager_config:
     apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
     yum: 'https://packages.wazuh.com/3.x/yum/'
     gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
-    kid: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
+    key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145'
   json_output: 'yes'
   alerts_log: 'yes'
   logall: 'no'
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
index e4b69bcb..58e4c232 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@@ -28,7 +28,7 @@
 - name: Debian/Ubuntu | Installing Wazuh repository key
   apt_key:
     url: "{{ wazuh_manager_config.repo.gpg }}"
-    id: "{{ wazuhrepo.kid }}"
+    id: "{{ wazuhrepo.key_id }}"
   when:
     - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
     - not wazuh_manager_sources_installation.enabled or not wazuh_api_sources_installation.enabled