diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml b/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml
index 01ce540c..aa50004f 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml
@@ -7,10 +7,22 @@
       - ansible_os_family|lower == "debian"
       - wazuh_custom_packages_installation_agent_enabled
 
-  - name: Install Wazuh Agent from .rpm packages
+  - name: Install Wazuh Agent from .rpm packages | yum
     yum:
       name: "{{ wazuh_custom_packages_installation_agent_rpm_url }}"
       state: present
     when:
       - ansible_os_family|lower == "redhat"
-      - wazuh_custom_packages_installation_agent_enabled
\ No newline at end of file
+      - wazuh_custom_packages_installation_agent_enabled
+      - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
+      - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
+
+  - name: Install Wazuh Agent from .rpm packages | dnf
+    dnf:
+      name: "{{ wazuh_custom_packages_installation_agent_rpm_url }}"
+      state: present
+    when:
+      - ansible_os_family|lower == "redhat"
+      - wazuh_custom_packages_installation_agent_enabled
+      - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
+        (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
\ No newline at end of file
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml b/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml
index c4081a08..0dc9808d 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml
@@ -19,19 +19,43 @@
       - ansible_os_family|lower == "debian"
 
   - block:
-    - name: Install Wazuh Manager from .rpm packages
+    - name: Install Wazuh Manager from .rpm packages | yum
       yum:
         name: "{{ wazuh_custom_packages_installation_manager_rpm_url }}"
         state: present
       when:
         - wazuh_custom_packages_installation_manager_enabled
+        - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
+        - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
 
-    - name: Install Wazuh API from .rpm packages
+    - name: Install Wazuh Manager from .rpm packages | dnf
+      dnf:
+        name: "{{ wazuh_custom_packages_installation_manager_rpm_url }}"
+        state: present
+      when:
+        - wazuh_custom_packages_installation_manager_enabled
+        - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
+          (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
+
+    - name: Install Wazuh API from .rpm packages | yum
       yum:
         name: "{{ wazuh_custom_packages_installation_api_rpm_url }}"
         state: present
       when:
         - wazuh_custom_packages_installation_api_enabled
+        - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
+        - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
         - wazuh_manager_config.cluster.node_type == "master"
+
+    - name: Install Wazuh API from .rpm packages | dnf
+      dnf:
+        name: "{{ wazuh_custom_packages_installation_api_rpm_url }}"
+        state: present
+      when:
+        - wazuh_custom_packages_installation_api_enabled
+        - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
+          (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
+        - wazuh_manager_config.cluster.node_type == "master"
+
     when:
       - ansible_os_family|lower == "redhat"
\ No newline at end of file