diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml
deleted file mode 100644
index 2b22dfbc..00000000
--- a/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Debian/Ubuntu | Remove Wazuh repository.
-  apt_repository:
-    repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
-    state: absent
-  changed_when: false
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml
deleted file mode 100644
index c725859e..00000000
--- a/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
-  yum_repository:
-    name: wazuh_repo
-    state: absent
-  changed_when: false
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
index bdd5ce83..72c995b8 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@@ -321,12 +321,6 @@
     - ( agent_groups is defined) and ( agent_groups|length > 0)
   tags: molecule-idempotence-notest
 
-- include_tasks: "RMRedHat.yml"
-  when:
-    - ansible_os_family == "RedHat" or ansible_os_family == "Amazon"
-    - not wazuh_manager_sources_installation.enabled
-
-- include_tasks: "RMDebian.yml"
-  when:
-    - ansible_os_family == "Debian"
-    - not wazuh_manager_sources_installation.enabled
+- name: Run uninstall tasks
+  include_tasks: uninstall.yml
+  when: not wazuh_manager_sources_installation.enabled
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml b/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml
new file mode 100644
index 00000000..b74f61a4
--- /dev/null
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml
@@ -0,0 +1,15 @@
+---
+
+- name: Debian/Ubuntu | Remove Wazuh repository.
+  apt_repository:
+    repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
+    state: absent
+  changed_when: false
+  when: not wazuh_manager_sources_installation.enabled
+
+- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
+  yum_repository:
+    name: wazuh_repo
+    state: absent
+  changed_when: false
+  when: ansible_os_family == "RedHat" or ansible_os_family == "Amazon"