diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp
index 76a66eae..7ee38e6f 100644
--- a/manifests/filebeat_oss.pp
+++ b/manifests/filebeat_oss.pp
@@ -60,21 +60,25 @@
     require => Package['filebeat'],
   }
 
-  archive { "/tmp/${$wazuh_filebeat_module}":
+  $wazuh_filebeat_module_dir = "/opt/filebeat_wazuh_modules/${basename($wazuh_filebeat_module, '.tar.gz')}"
+
+  file { ['/opt/filebeat_wazuh_modules', $wazuh_filebeat_module_dir]:
+    ensure => directory,
+    mode   => '0755',
+  }
+  -> archive { "/tmp/${wazuh_filebeat_module}":
     ensure       => present,
-    source       => "https://packages.wazuh.com/4.x/filebeat/${$wazuh_filebeat_module}",
+    source       => "https://packages.wazuh.com/4.x/filebeat/${wazuh_filebeat_module}",
     extract      => true,
-    extract_path => '/usr/share/filebeat/module',
-    creates      => '/usr/share/filebeat/module/wazuh',
+    extract_path => $wazuh_filebeat_module_dir,
+    creates      => "${wazuh_filebeat_module_dir}/wazuh",
     cleanup      => true,
-    notify       => Service['filebeat'],
-    require      => Package['filebeat'],
   }
-
-  file { '/usr/share/filebeat/module/wazuh':
-    ensure  => 'directory',
-    mode    => '0755',
+  -> file { '/usr/share/filebeat/module/wazuh':
+    ensure  => link,
+    target  => "${wazuh_filebeat_module_dir}/wazuh",
     require => Package['filebeat'],
+    notify  => Service['filebeat'],
   }
 
   require wazuh::certificates