diff --git a/roles/opendistro/opendistro-elasticsearch/handlers/main.yml b/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
index 95f5868b..3cfaa6b0 100644
--- a/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 - name: restart elasticsearch
-  service: 
+  service:
     name: elasticsearch
     state: restarted
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
index 1a2eed56..f018c9f7 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
@@ -23,7 +23,7 @@
 
   - name: RedHat/CentOS/Fedora | Install OpenJDK 11
     yum:
-      name: java-11-openjdk-devel 
+      name: java-11-openjdk-devel
       state: present
 
   - name: RedHat/CentOS/Fedora | Install OpenDistro dependencies
diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index dac051a4..bac623e7 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -39,6 +39,7 @@ wazuh_managers:
     api_port: 55000
     api_proto: 'http'
     api_user: null
+wazuh_api_reachable_from_agent: false
 wazuh_profile_centos: 'centos, centos7, centos7.6'
 wazuh_profile_ubuntu: 'ubuntu, ubuntu18, ubuntu18.04'
 wazuh_auto_restart: 'yes'
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
index 9528aa33..2c4e2f5e 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
@@ -123,15 +123,15 @@
         user: "{{ wazuh_managers.0.api_user }}"
         password: "{{ api_pass }}"
       register: newagent_api
-      notify: restart wazuh-agent
-      # changed_when: newagent_api.json.error == 0
-      vars:
-        agent_name: "{% if single_agent_name is defined %}{{ single_agent_name }}{% else %}{{ inventory_hostname }}{% endif %}"
+      delegate_to: "{{ 'localhost' if not wazuh_api_reachable_from_agent else inventory_hostname }}"
+      become: no
+      changed_when: newagent_api.json.error == 0
       when:
         - not check_keys.stat.exists or check_keys.stat.size == 0
-        - wazuh_agent_authd.registration_address is not none
-      become: false
-      ignore_errors: true
+        - wazuh_managers.0.address is not none
+      tags:
+        - config
+        - api
 
     - name: Linux | Retieve new agent data via rest-API
       uri:
@@ -148,8 +148,11 @@
         - wazuh_agent_authd.registration_address is not none
         - newagent_api.json.error == 0
       register: newagentdata_api
-      delegate_to: localhost
-      become: false
+      delegate_to: "{{ 'localhost' if not wazuh_api_reachable_from_agent else inventory_hostname }}"
+      become: no
+      tags:
+        - config
+        - api
 
     - name: Linux | Register agent (via rest-API)
       command: /var/ossec/bin/manage_agents