diff --git a/data/hostname/search-esnode1.internal.softwareheritage.org.yaml b/data/hostname/search-esnode1.internal.softwareheritage.org.yaml
deleted file mode 100644
--- a/data/hostname/search-esnode1.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-swh::apt_config::enable_non_free: true
-swh::apt_config::backported_packages:
-  buster:
-    - linux-image-amd64
-    - linux-headers-amd64
-    - libnvpair1linux
-    - libuutil1linux
-    - libzfs2linux
-    - libzpool2linux
-    - zfs-dkms
-    - zfsutils-linux
-    - zfs-zed
-
-elastic::elk_version: '7.9.3'
-
-# Elasticsearch
-elasticsearch::config::cluster::name: swh-search
-
-elasticsearch::config::discovery::seed_hosts:
-  - search-esnode1.internal.softwareheritage.org
-  - search-esnode2.internal.softwareheritage.org
-  - search-esnode3.internal.softwareheritage.org
-
-elasticsearch::config::cluster::initial_master_nodes:
-  - search-esnode1
-  - search-esnode2
-  - search-esnode3
-
-elasticsearch::jvm_options::heap_size: 8g
-elasticsearch::config::prometheus::indices: true
diff --git a/data/hostname/search-esnode2.internal.softwareheritage.org.yaml b/data/hostname/search-esnode2.internal.softwareheritage.org.yaml
deleted file mode 100644
--- a/data/hostname/search-esnode2.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-swh::apt_config::enable_non_free: true
-swh::apt_config::backported_packages:
-  buster:
-    - linux-image-amd64
-    - linux-headers-amd64
-    - libnvpair1linux
-    - libuutil1linux
-    - libzfs2linux
-    - libzpool2linux
-    - zfs-dkms
-    - zfsutils-linux
-    - zfs-zed
-
-elastic::elk_version: '7.9.3'
-
-# Elasticsearch
-elasticsearch::config::cluster::name: swh-search
-
-elasticsearch::config::discovery::seed_hosts:
-  - search-esnode1.internal.softwareheritage.org
-  - search-esnode2.internal.softwareheritage.org
-  - search-esnode3.internal.softwareheritage.org
-
-elasticsearch::config::cluster::initial_master_nodes:
-  - search-esnode1
-  - search-esnode2
-  - search-esnode3
-
-elasticsearch::jvm_options::heap_size: 8g
-elasticsearch::config::prometheus::indices: true
diff --git a/data/hostname/search-esnode3.internal.softwareheritage.org.yaml b/data/hostname/search-esnode3.internal.softwareheritage.org.yaml
deleted file mode 100644
--- a/data/hostname/search-esnode3.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-swh::apt_config::enable_non_free: true
-swh::apt_config::backported_packages:
-  buster:
-    - linux-image-amd64
-    - linux-headers-amd64
-    - libnvpair1linux
-    - libuutil1linux
-    - libzfs2linux
-    - libzpool2linux
-    - zfs-dkms
-    - zfsutils-linux
-    - zfs-zed
-
-elastic::elk_version: '7.9.3'
-
-# Elasticsearch
-elasticsearch::config::cluster::name: swh-search
-
-elasticsearch::config::discovery::seed_hosts:
-  - search-esnode1.internal.softwareheritage.org
-  - search-esnode2.internal.softwareheritage.org
-  - search-esnode3.internal.softwareheritage.org
-
-elasticsearch::config::cluster::initial_master_nodes:
-  - search-esnode1
-  - search-esnode2
-  - search-esnode3
-
-elasticsearch::jvm_options::heap_size: 8g
-elasticsearch::config::prometheus::indices: true
diff --git a/data/hostname/search-esnode4.internal.softwareheritage.org.yaml b/data/hostname/search-esnode4.internal.softwareheritage.org.yaml
--- a/data/hostname/search-esnode4.internal.softwareheritage.org.yaml
+++ b/data/hostname/search-esnode4.internal.softwareheritage.org.yaml
@@ -11,7 +11,10 @@
     - zfsutils-linux
     - zfs-zed
 
-elastic::elk_version: '7.9.3'
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  ingest.geoip.downloader.enabled: false
+
 elastic::beat_version: '7.15.2'
 
 # Elasticsearch
diff --git a/data/hostname/search-esnode5.internal.softwareheritage.org.yaml b/data/hostname/search-esnode5.internal.softwareheritage.org.yaml
--- a/data/hostname/search-esnode5.internal.softwareheritage.org.yaml
+++ b/data/hostname/search-esnode5.internal.softwareheritage.org.yaml
@@ -11,7 +11,10 @@
     - zfsutils-linux
     - zfs-zed
 
-elastic::elk_version: '7.9.3'
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  ingest.geoip.downloader.enabled: false
+
 elastic::beat_version: '7.15.2'
 
 # Elasticsearch
diff --git a/data/hostname/search-esnode6.internal.softwareheritage.org.yaml b/data/hostname/search-esnode6.internal.softwareheritage.org.yaml
--- a/data/hostname/search-esnode6.internal.softwareheritage.org.yaml
+++ b/data/hostname/search-esnode6.internal.softwareheritage.org.yaml
@@ -11,7 +11,10 @@
     - zfsutils-linux
     - zfs-zed
 
-elastic::elk_version: '7.9.3'
+elastic::elk_version: '7.15.2'
+elasticsearch::config::extras:
+  ingest.geoip.downloader.enabled: false
+
 elastic::beat_version: '7.15.2'
 
 # Elasticsearch