diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml
index 4948c252..496a7687 100644
--- a/roles/wazuh/ansible-filebeat/tasks/main.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/main.yml
@@ -67,25 +67,26 @@
 - name: Checking if Filebeat Module folder file exists
   stat:
     path: "{{ filebeat_module_folder }}"
-  register: filebeat_module_folder
+  register: filebeat_module_folder_info
 
+- name: Download, uncompress and apply permissions for Filebeat
+  block:
 
-- name: Download Filebeat module package
-  get_url:
-    url: "{{ filebeat_module_package_url }}/{{ filebeat_module_package_name }}"
-    dest: "{{ filebeat_module_package_path }}"
-  when: not filebeat_module_folder.stat.exists
+    - name: Download Filebeat module package
+      get_url:
+        url: "{{ filebeat_module_package_url }}/{{ filebeat_module_package_name }}"
+        dest: "{{ filebeat_module_package_path }}"
 
-- name: Unpakcing Filebeat module package
-  unarchive:
-    src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}"
-    dest: "{{ filebeat_module_destination }}"
-    remote_src: yes
-  when: not filebeat_module_folder.stat.exists
+    - name: Unpacking Filebeat module package
+      unarchive:
+        src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}"
+        dest: "{{ filebeat_module_destination }}"
+        remote_src: yes
 
-- name: Setting 0755 permission for Filebeat module folder
-  file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes
-  when: not filebeat_module_folder.stat.exists
+    - name: Setting 0755 permission for Filebeat module folder
+      file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes
+
+  when: not filebeat_module_folder_info.stat.exists
 
 - name: Checking if Filebeat Module package file exists
   stat:
@@ -99,6 +100,7 @@
     path: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}"
   when: filebeat_module_package.stat.exists
 
+- meta: end_play
 - import_tasks: config.yml
   when: filebeat_create_config
   notify: restart filebeat