diff --git a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker01.euwest.azure.internal.softwareheritage.org.yaml
copy from data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
copy to data/hostname/index-worker01.euwest.azure.internal.softwareheritage.org.yaml
--- a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/index-worker01.euwest.azure.internal.softwareheritage.org.yaml
@@ -1,8 +1,6 @@
 ---
 swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
   - indexer_content_mimetype
   - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
 
-swh::deploy::worker::instances:
-  - vault_cooker
diff --git a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker02.euwest.azure.internal.softwareheritage.org.yaml
copy from data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
copy to data/hostname/index-worker02.euwest.azure.internal.softwareheritage.org.yaml
--- a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/index-worker02.euwest.azure.internal.softwareheritage.org.yaml
@@ -1,8 +1,6 @@
 ---
 swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
   - indexer_content_mimetype
   - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
 
-swh::deploy::worker::instances:
-  - vault_cooker
diff --git a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker03.euwest.azure.internal.softwareheritage.org.yaml
copy from data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
copy to data/hostname/index-worker03.euwest.azure.internal.softwareheritage.org.yaml
--- a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/index-worker03.euwest.azure.internal.softwareheritage.org.yaml
@@ -1,8 +1,7 @@
 ---
 swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
   - indexer_content_mimetype
   - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
 
-swh::deploy::worker::instances:
-  - vault_cooker
+
diff --git a/data/hostname/index-worker04.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker04.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
--- /dev/null
+++ b/data/hostname/index-worker04.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,5 @@
+---
+swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
+  - indexer_origin_intrinsic_metadata
+
diff --git a/data/hostname/index-worker05.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker05.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
--- /dev/null
+++ b/data/hostname/index-worker05.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,5 @@
+---
+swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
+  - indexer_origin_intrinsic_metadata
+
diff --git a/data/hostname/index-worker06.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/index-worker06.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
--- /dev/null
+++ b/data/hostname/index-worker06.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,6 @@
+---
+swh::deploy::worker::instances:
+  - indexer_origin_extrinsic_metadata
+  - indexer_origin_intrinsic_metadata
+
+
diff --git a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
--- a/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/data/hostname/vault-worker01.euwest.azure.internal.softwareheritage.org.yaml
@@ -1,8 +1,3 @@
 ---
-swh::deploy::worker::instances:
-  - indexer_content_mimetype
-  - indexer_fossology_license
-  - indexer_origin_intrinsic_metadata
-
 swh::deploy::worker::instances:
   - vault_cooker