diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index c82e52ce..1b9c1da5 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -30,9 +30,9 @@
 
 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
   apt_key:
-    keyserver: "{{ elasticrepo_gpg_keyserver }}"
+    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
     id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
-
+    state: present
 
 - name: Debian/Ubuntu | Install Elastic repo
   apt_repository:
diff --git a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
index b00ad94a..4a621092 100644
--- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
@@ -8,10 +8,11 @@
   register: kibana_installing_ca_package
   until: kibana_installing_ca_package is succeeded
 
-- name: Debian/Ubuntu | Add Elasticsearch GPG key
+- name: Debian/Ubuntu | Add Elasticsearch GPG key.
   apt_key:
-    keyserver: "{{ elasticrepo_gpg_keyserver }}"
+    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
     id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
+    state: present
 
 - name: Debian/Ubuntu | Install Elastic repo
   apt_repository:
diff --git a/roles/wazuh/ansible-filebeat/tasks/Debian.yml b/roles/wazuh/ansible-filebeat/tasks/Debian.yml
index a192c401..ed4cde1a 100644
--- a/roles/wazuh/ansible-filebeat/tasks/Debian.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/Debian.yml
@@ -8,10 +8,11 @@
   register: filebeat_ca_packages_install
   until: filebeat_ca_packages_install is succeeded
 
-- name: Debian/Ubuntu | Add Elasticsearch apt key.
+- name: Debian/Ubuntu | Add Elasticsearch GPG key.
   apt_key:
-    keyserver: "{{ elasticrepo_gpg_keyserver }}"
+    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
     id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
+    state: present
 
 - name: Debian/Ubuntu | Add Filebeat repository.
   apt_repository:
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
index 0e0ba92f..d3d12c22 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
@@ -25,6 +25,7 @@
 - name: Debian/Ubuntu | Installing Wazuh repository key
   apt_key:
     url: "{{ wazuh_agent_config.repo.gpg }}"
+    id: 0DCFCA5547B19D2A6099506096B3EE5F29111145
   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/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
index e045059d..f47a3ef7 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@@ -28,6 +28,7 @@
 - name: Debian/Ubuntu | Installing Wazuh repository key
   apt_key:
     url: "{{ wazuh_manager_config.repo.gpg }}"
+    id: 0DCFCA5547B19D2A6099506096B3EE5F29111145
   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