diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bd805cb..c4d6a329 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,13 +3,14 @@ All notable changes to this project will be documented in this file.
 
 ## [v3.xx.x_x.x.x]
 
-## Changed
+### Changed
 
 - Make Wazuh repositories installation flexible [@jm404](https://github.com/jm404) [#288](https://github.com/wazuh/wazuh-ansible/pull/288)
 
 ### Fixed
 
 - Wazuh Agent registration using agent name has been fixed [@jm404](https://github.com/jm404) [#298](https://github.com/wazuh/wazuh-ansible/pull/298)
+- Fix Wazuh repository and installation conditionals  [@jm404](https://github.com/jm404) [#299](https://github.com/wazuh/wazuh-ansible/pull/299)
 
 ## [v3.10.2_7.3.2]
 
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
index 88c0784b..426bc75a 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
@@ -10,7 +10,7 @@
   async: 90
   poll: 30
   when:
-    - ansible_distribution in ['CentOS','RedHat']
+    - ansible_os_family|lower == "redhat"
   tags:
     - init
 
@@ -20,7 +20,7 @@
     state: present
     cache_valid_time: 3600
   when:
-    - not (ansible_distribution in ['CentOS','RedHat'])
+    - ansible_os_family|lower != "redhat"
   tags:
     - init
 
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/RedHat.yml b/roles/wazuh/ansible-wazuh-agent/tasks/RedHat.yml
index 7bfcc611..5c026a13 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/RedHat.yml
@@ -8,7 +8,7 @@
     gpgcheck: true
   changed_when: false
   when:
-    - (ansible_facts['os_family']|lower == 'redhat')
+    - (ansible_facts['os_family']|lower == 'redhat') and (ansible_distribution|lower != 'amazon')
     - (ansible_distribution_major_version|int <= 5)
   register: repo_v5_installed
 
@@ -21,7 +21,7 @@
     gpgcheck: true
   changed_when: false
   when:
-    - repo_v5_installed.skipped
+    - repo_v5_installed is skipped
     
 - name: RedHat/CentOS/Fedora | download Oracle Java RPM
   get_url:
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
index fd614765..d64829a9 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
@@ -52,7 +52,7 @@
     gpgcheck: true
   changed_when: false
   when:
-    - repo_v5_manager_installed|skipped
+    - repo_v5_manager_installed is skipped
 
 - name: RedHat/CentOS/Fedora | Install openscap
   package: name={{ item }} state=present