diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
index 347d520..c6575df 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@@ -81,26 +81,32 @@
   tags:
     - init
 
-- name: Debian/Ubuntu | Install OpenScap
-  apt:
-    name:
-      - libopenscap8
-      - xsltproc
-    state: present
-    cache_valid_time: 3600
-    install_recommends: false
-  register: wazuh_manager_openscap_installed
-  until: wazuh_manager_openscap_installed is succeeded
-  when: wazuh_manager_config.openscap.disable == 'no'
-  tags:
-    - init
+- name: Debian/Ubuntu | Install OpenScap                                                                                                                                            
+  apt:                                                                                                                                                                              
+    name: "{{ item }}"                                                                                                                                                              
+    state: present                                                                                                                                                                  
+  loop: "{{ openscap_packages }}"                                                                                                                                                   
+  when: wazuh_agent_config.openscap.disable == 'no'                                                                                                                                 
+  tags:                                                                                                                                                                             
+    - init                                                                                                                                                                          
+  register: wazuh_agent_OpenScap_package_install                                                                                                                                    
+  until: wazuh_agent_OpenScap_package_install is succeeded                                                                                                                          
+  vars:                                                                                                                                                                             
+    openscap_packages: "{{                                                                                                                                                          
+      (ansible_distribution_version is version('24.04', '>=')) | ternary(                                                                                                           
+        ['openscap-scanner', 'xsltproc'],                                                                                                                                           
+        ['libopenscap8', 'xsltproc']                                                                                                                                                
+      )                                                                                                                                                                             
+    }}"
 
-- name: Debian/Ubuntu | Get OpenScap installed version
-  shell: "dpkg-query --showformat='${Version}' --show libopenscap8"
-  when: wazuh_manager_config.openscap.disable == 'no'
-  register: openscap_version
-  changed_when: false
-  tags:
+- name: Debian/Ubuntu | Get OpenScap installed version                                                                                                                              
+  shell: "dpkg-query --showformat='${Version}' --show {{ openscap_package_name }}"                                                                                                  
+  register: openscap_version                                                                                                                                                        
+  changed_when: false                                                                                                                                                               
+  when: wazuh_agent_config.openscap.disable == 'no'                                                                                                                                 
+  vars:                                                                                                                                                                             
+    openscap_package_name: "{{ (ansible_distribution_version is version('24.04', '>=')) | ternary('openscap-scanner', 'libopenscap8') }}"                                           
+  tags:                                                                                                                                                                             
     - config
 
 - name: Debian/Ubuntu | Check OpenScap version