diff --git a/etc/openstack-cluster-installer/openstack-cluster-installer.conf b/etc/openstack-cluster-installer/openstack-cluster-installer.conf
index dd093eebc26e51ad552c0db48ee69dd92b56ed70..971e5beb52e2525b8ac93baa85dd8068a5e43204 100644
--- a/etc/openstack-cluster-installer/openstack-cluster-installer.conf
+++ b/etc/openstack-cluster-installer/openstack-cluster-installer.conf
@@ -295,4 +295,4 @@ auto_install_machines_num_of_discovery=15
 [filebeat]
 # Repository URL for Filebeat.
 # Our mirror: http://apt.infomaniak.ch/artifacts.elastic.co/packages/6.x/apt
-filebeat_repo=https://artifacts.elastic.co/packages/6.x/apt
+filebeat_repo=https://artifacts.elastic.co/packages/7.x/apt
diff --git a/puppet/manifests/filebeat.pp b/puppet/manifests/filebeat.pp
index ce21fc1330ae342811d2771337db5ca73bc8219c..d3aff4a9aaf75a83d504ac002ce49a5ea3130b29 100644
--- a/puppet/manifests/filebeat.pp
+++ b/puppet/manifests/filebeat.pp
@@ -97,12 +97,13 @@ qPDlGRlOgVTd9xUfHFkzB52c70E=
     class { 'filebeat':
       manage_repo       => false,
       manage_apt        => false,
-      major_version     => '6',
+      major_version     => '7',
       fields_under_root => $fields_under_root,
       outputs           => {
           'logstash' => {
               'hosts'       => $output_hosts,
               'loadbalance' => true,
+              'workers'     => 4,
             },
         },
       logging => {