diff --git a/roles/debian/wazuh/tasks/main.yml b/roles/debian/wazuh/tasks/main.yml
index 726d38335..7224c1c1e 100644
--- a/roles/debian/wazuh/tasks/main.yml
+++ b/roles/debian/wazuh/tasks/main.yml
@@ -133,28 +133,17 @@
     state: restarted
   when: filebeat_exists
 
-- name: Check if wazuh-manager service exists
-  ansible.builtin.command: systemctl list-unit-files --type=service --no-pager
-  register: wazuh_service
-  ignore_errors: true
-  changed_when: false
-
-- name: Generate random password
-  ansible.builtin.set_fact:
-    authd_password: "{{ lookup('password', '/dev/null length=32') }}"
-  when: "'wazuh-manager.service' in wazuh_service.stdout"
-
 - name: Write the password to /var/ossec/etc/authd.pass
   ansible.builtin.copy:
     dest: /var/ossec/etc/authd.pass
-    content: "{{ authd_password }}"
+    content: "{{ _wazuh_authd }}"
     mode: '0640'
     owner: root
     group: wazuh
-  when: "'wazuh-manager.service' in wazuh_service.stdout"
+  when: "'wazuh-manager.service' in wazuh_service.stdout or 'wazuh-agent.service' in wazuh_service.stdout"
 
 - name: Restart wazuh-manager to apply changes
   ansible.builtin.systemd:
     name: wazuh-manager
     state: restarted
-  when: "'wazuh-manager.service' in wazuh_service.stdout"
+  when: "'wazuh-manager.service' in wazuh_service.stdout or 'wazuh-agent.service' in wazuh_service.stdout"