diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -3276,6 +3276,8 @@
   path.logs: "%{alias('elasticsearch::config::path::logs')}"
   http.port: "%{alias('elasticsearch::config::http::port')}"
   prometheus.indices: "%{alias('elasticsearch::config::prometheus::indices')}"
+  indices.memory.index_buffer_size: 50%
+  index.store.type: hybridfs
 
 logstash::listen_network: "%{lookup('internal_network')}"
 logstash::elasticsearch::hosts: "%{alias('elasticsearch::hosts')}"
diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml
--- a/data/deployments/production/common.yaml
+++ b/data/deployments/production/common.yaml
@@ -11,10 +11,6 @@
   - esnode2
   - esnode3
 
-elasticsearch::config::extras:
-  indices.memory.index_buffer_size: 50%
-  index.store.type: hybridfs
-
 elasticsearch::jvm_options::heap_size: 16g
 
 swh::postgresql::shared_buffers: 4GB
diff --git a/data/hostname/esnode1.internal.softwareheritage.org.yaml b/data/hostname/esnode1.internal.softwareheritage.org.yaml
--- a/data/hostname/esnode1.internal.softwareheritage.org.yaml
+++ b/data/hostname/esnode1.internal.softwareheritage.org.yaml
@@ -10,3 +10,7 @@
     - zfs-dkms
     - zfsutils-linux
     - zfs-zed
+
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  xpack.security.enabled: false
diff --git a/data/hostname/esnode2.internal.softwareheritage.org.yaml b/data/hostname/esnode2.internal.softwareheritage.org.yaml
--- a/data/hostname/esnode2.internal.softwareheritage.org.yaml
+++ b/data/hostname/esnode2.internal.softwareheritage.org.yaml
@@ -10,3 +10,7 @@
     - zfs-dkms
     - zfsutils-linux
     - zfs-zed
+
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  xpack.security.enabled: false
diff --git a/data/hostname/esnode3.internal.softwareheritage.org.yaml b/data/hostname/esnode3.internal.softwareheritage.org.yaml
--- a/data/hostname/esnode3.internal.softwareheritage.org.yaml
+++ b/data/hostname/esnode3.internal.softwareheritage.org.yaml
@@ -10,3 +10,7 @@
     - zfs-dkms
     - zfsutils-linux
     - zfs-zed
+
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  xpack.security.enabled: false
diff --git a/data/hostname/kibana0.internal.softwareheritage.org.yaml b/data/hostname/kibana0.internal.softwareheritage.org.yaml
new file mode 100644
--- /dev/null
+++ b/data/hostname/kibana0.internal.softwareheritage.org.yaml
@@ -0,0 +1 @@
+elastic::elk_version: '7.15.2'
diff --git a/site-modules/profile/manifests/kibana.pp b/site-modules/profile/manifests/kibana.pp
--- a/site-modules/profile/manifests/kibana.pp
+++ b/site-modules/profile/manifests/kibana.pp
@@ -9,7 +9,7 @@
 
   apt::pin { 'kibana':
     packages => 'kibana',
-    version => $version,
+    version  => $version,
     priority => 1001,
   }
 
diff --git a/site-modules/profile/manifests/prometheus/elasticsearch.pp b/site-modules/profile/manifests/prometheus/elasticsearch.pp
--- a/site-modules/profile/manifests/prometheus/elasticsearch.pp
+++ b/site-modules/profile/manifests/prometheus/elasticsearch.pp
@@ -6,9 +6,12 @@
   $version = lookup('prometheus::elasticsearch::exporter::version')
 
   $archive_url = "https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/${version}/prometheus-exporter-${version}.zip"
-  $archive_path = '/usr/share/elasticsearch/plugins/prometheus-exporter'
+  $plugin_path = '/usr/share/elasticsearch/plugins/prometheus-exporter'
 
-  file { $archive_path:
+  exec {'cleanup prometheus exporter plugin':
+    creates => "${plugin_path}/prometheus-exporter-${version}.jar",
+    command => "/usr/bin/rm -rf ${plugin_path}",
+  } -> file { $plugin_path:
     ensure  => directory,
     owner   => 'elasticsearch',
     group   => 'elasticsearch',
@@ -19,13 +22,16 @@
     path         => "/tmp/prometheus-exporter-${version}.zip",
     source       => $archive_url,
     extract      => true,
-    extract_path => '/usr/share/elasticsearch/plugins/prometheus-exporter',
-    creates      => "${archive_path}/plugin-descriptor.properties",
+    extract_path => $plugin_path,
+    creates      => "${plugin_path}/prometheus-exporter-${version}.jar",
     cleanup      => true,
     user         => 'root',
     group        => 'root',
-    require      => Package['elasticsearch'],
+    require      => [
+      Package['elasticsearch'],
+    ],
   }
 
+
   Archive['prometheus-elasticsearch-exporter'] ~> Service['elasticsearch']
 }