diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
index 61e2412d..11f15255 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
@@ -20,19 +20,19 @@
 
 - name: Windows | Check if Wazuh installer is already downloaded
   win_stat:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
   register: wazuh_package_downloaded
 
 - name: Windows | Download Wazuh Agent package
   win_get_url:
-    url: "{{ wazuh_winagent_config.repo }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    url: "{{ wazuh_winagent_config_url }}"
     dest: "{{ wazuh_winagent_config.download_dir }}"
   when:
     - not wazuh_package_downloaded.stat.exists
 
 - name: Windows | Verify the Wazuh Agent installer
   win_stat:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     get_checksum: true
     checksum_algorithm: md5
   register: wazuh_agent_status
@@ -41,11 +41,12 @@
 
 - name: Windows | Install Agent if not already installed
   win_package:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     state: present
 
 - name: Windows | Check if client.keys exists
-  win_stat: path="{{ wazuh_agent_win_path }}client.keys"
+  win_stat: 
+    path: "{{ wazuh_agent_win_path }}client.keys"
   register: check_windows_key
   tags:
     - config
@@ -94,5 +95,5 @@
 
 - name: Windows | Delete downloaded Wazuh agent installer file
   win_file:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     state: absent