diff --git a/data/hostname/worker01.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker01.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index e555fdc6..00000000
--- a/data/hostname/worker01.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
-  - swh_indexer_orchestrator
-  - swh_indexer_orchestrator_text
diff --git a/data/hostname/worker02.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker02.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index cfd20f26..00000000
--- a/data/hostname/worker02.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
diff --git a/data/hostname/worker03.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker03.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index e555fdc6..00000000
--- a/data/hostname/worker03.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
-  - swh_indexer_orchestrator
-  - swh_indexer_orchestrator_text
diff --git a/data/hostname/worker04.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker04.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index cfd20f26..00000000
--- a/data/hostname/worker04.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
diff --git a/data/hostname/worker05.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker05.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index e555fdc6..00000000
--- a/data/hostname/worker05.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
-  - swh_indexer_orchestrator
-  - swh_indexer_orchestrator_text
diff --git a/data/hostname/worker06.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker06.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index e555fdc6..00000000
--- a/data/hostname/worker06.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
-  - swh_indexer_orchestrator
-  - swh_indexer_orchestrator_text
diff --git a/data/hostname/worker07.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker07.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index e555fdc6..00000000
--- a/data/hostname/worker07.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
-  - swh_indexer_orchestrator
-  - swh_indexer_orchestrator_text
diff --git a/data/hostname/worker08.euwest.azure.internal.softwareheritage.org.yaml b/data/hostname/worker08.euwest.azure.internal.softwareheritage.org.yaml
deleted file mode 100644
index cfd20f26..00000000
--- a/data/hostname/worker08.euwest.azure.internal.softwareheritage.org.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-swh::deploy::worker::instances:
-  - swh_indexer_rehash
-  - swh_indexer_mimetype
-  - swh_indexer_language
-  - swh_indexer_fossology_license
diff --git a/data/location/azure_euwest.yaml b/data/location/azure_euwest.yaml
index b1a99397..6e6dff39 100644
--- a/data/location/azure_euwest.yaml
+++ b/data/location/azure_euwest.yaml
@@ -1,14 +1,16 @@
 ---
 dns::forwarders:
   - 168.63.129.16
 dns::forwarder_insecure: false
 
 icinga2::network: 192.168.200.0/21
 
 munin::node::network: 192.168.200.0/21
 
 swh::deploy::worker::instances:
   - swh_indexer_rehash
   - swh_indexer_mimetype
   - swh_indexer_language
   - swh_indexer_fossology_license
+  - swh_indexer_orchestrator_text
+  - swh_indexer_orchestrator_all