diff --git a/ansible/playbooks/wazuh.yml b/ansible/playbooks/wazuh.yml
index 1a37fa9..782f550 100644
--- a/ansible/playbooks/wazuh.yml
+++ b/ansible/playbooks/wazuh.yml
@@ -21,7 +21,7 @@
             url: "{{ wazuh_url }}/{{ wazuh_msi }}"
             dest: "C:\\Users\\Administrator\\AppData\\Local\\Temp{{ wazuh_msi }}"
           when: |
-            inventory_hostname not in groups['meta-type_client'] or
+            inventory_hostname not in groups['meta-type_client']|default([]) or
             project_zone == 'standard'
 
         - name: Download agent using proxy
@@ -31,7 +31,7 @@
             url: "{{ wazuh_url }}/{{ wazuh_msi }}"
             dest: "C:\\Users\\Administrator\\AppData\\Local\\Temp{{ wazuh_msi }}"
           when: |
-            inventory_hostname in groups['meta-type_client'] and
+            inventory_hostname in groups['meta-type_client']|default([]) and
             project_zone == 'protected'
 
         - name: Install agent
@@ -51,7 +51,7 @@
 
 - name: Wazuh Groups
   hosts: eidf-wazuh01
-  gather_facts: no
+  gather_facts: false
   vars_files:
     - ../vars/common.yml
   tasks:
diff --git a/ansible/roles/win_client/tasks/chocolatey.yml b/ansible/roles/win_client/tasks/chocolatey.yml
index c0bc55c..c8c4330 100644
--- a/ansible/roles/win_client/tasks/chocolatey.yml
+++ b/ansible/roles/win_client/tasks/chocolatey.yml
@@ -38,7 +38,7 @@
         bypass:
         - <local>
       when: |
-        inventory_hostname in groups['meta-type_client'] and
+        inventory_hostname in groups['meta-type_client']|default([]) and
         project_zone == 'protected'
 
     - name: Install Chocolatey GUI
diff --git a/ansible/roles/win_domain_membership/tasks/join.yml b/ansible/roles/win_domain_membership/tasks/join.yml
index 20c3f83..27db47e 100644
--- a/ansible/roles/win_domain_membership/tasks/join.yml
+++ b/ansible/roles/win_domain_membership/tasks/join.yml
@@ -40,4 +40,4 @@
         state: "domain"
         domain_ou_path: ou=Workbench,dc={{ win_project }},dc=loc
         reboot: true
-      when: "inventory_hostname in groups['meta-type_client']"
+      when: "inventory_hostname in groups['meta-type_client']|default([])"