diff --git a/roles/debian/wazuh/tasks/main.yml b/roles/debian/wazuh/tasks/main.yml
index 96206ee44..45d4fbeeb 100644
--- a/roles/debian/wazuh/tasks/main.yml
+++ b/roles/debian/wazuh/tasks/main.yml
@@ -134,7 +134,7 @@
   when: filebeat_exists
 
 - name: Check if wazuh-manager service exists
-  ansible.builtin.command: systemctl list-units --full -all | grep -q wazuh-manager
+  ansible.builtin.command: systemctl list-unit-files --type=service --no-pager | grep -w wazuh-manager.service
   register: wazuh_service
   ignore_errors: true
   changed_when: false
@@ -142,7 +142,7 @@
 - name: Generate random password
   ansible.builtin.set_fact:
     authd_password: "{{ lookup('password', '/dev/null length=32') }}"
-  when: wazuh_service.rc == 0
+  when: wazuh_service.rc == 0 and wazuh_service.stdout != ""
 
 - name: Write the password to /var/ossec/etc/authd.pass
   ansible.builtin.copy:
@@ -151,10 +151,10 @@
     mode: '0640'
     owner: root
     group: wazuh
-  when: wazuh_service.rc == 0
+  when: wazuh_service.rc == 0 and wazuh_service.stdout != ""
 
 - name: Restart wazuh-manager to apply changes
   ansible.builtin.systemd:
     name: wazuh-manager
     state: restarted
-  when: wazuh_service.rc == 0
+  when: wazuh_service.rc == 0 and wazuh_service.stdout != ""