diff --git a/data/hostname/worker01.softwareheritage.org.yaml b/data/hostname/worker01.softwareheritage.org.yaml
index 9dd031b6..afd19321 100644
--- a/data/hostname/worker01.softwareheritage.org.yaml
+++ b/data/hostname/worker01.softwareheritage.org.yaml
@@ -1,15 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.21
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.21
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
diff --git a/data/hostname/worker02.softwareheritage.org.yaml b/data/hostname/worker02.softwareheritage.org.yaml
index b86d8565..94cf2ae9 100644
--- a/data/hostname/worker02.softwareheritage.org.yaml
+++ b/data/hostname/worker02.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.22
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.22
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker03.softwareheritage.org.yaml b/data/hostname/worker03.softwareheritage.org.yaml
index 5f1218cc..326eccdb 100644
--- a/data/hostname/worker03.softwareheritage.org.yaml
+++ b/data/hostname/worker03.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.23
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.23
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker04.softwareheritage.org.yaml b/data/hostname/worker04.softwareheritage.org.yaml
index 676c6f3c..f050235c 100644
--- a/data/hostname/worker04.softwareheritage.org.yaml
+++ b/data/hostname/worker04.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.24
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.24
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker05.softwareheritage.org.yaml b/data/hostname/worker05.softwareheritage.org.yaml
index 8a2b1879..58d2d51a 100644
--- a/data/hostname/worker05.softwareheritage.org.yaml
+++ b/data/hostname/worker05.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.25
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.25
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker06.softwareheritage.org.yaml b/data/hostname/worker06.softwareheritage.org.yaml
index 4d4baf0b..b8bfa27a 100644
--- a/data/hostname/worker06.softwareheritage.org.yaml
+++ b/data/hostname/worker06.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.26
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.26
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker07.softwareheritage.org.yaml b/data/hostname/worker07.softwareheritage.org.yaml
index fac99d35..9aac035e 100644
--- a/data/hostname/worker07.softwareheritage.org.yaml
+++ b/data/hostname/worker07.softwareheritage.org.yaml
@@ -1,16 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.27
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.27
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker08.softwareheritage.org.yaml b/data/hostname/worker08.softwareheritage.org.yaml
index 7f2c9bcf..605007dc 100644
--- a/data/hostname/worker08.softwareheritage.org.yaml
+++ b/data/hostname/worker08.softwareheritage.org.yaml
@@ -1,19 +1,14 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.28
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.28
     netmask: 255.255.255.0
     gateway: 128.93.193.254
 
 dar::backup::select:
   - home
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_lister_github
-  - swh_loader_svn
diff --git a/data/hostname/worker09.softwareheritage.org.yaml b/data/hostname/worker09.softwareheritage.org.yaml
index 9f14d86b..047c955a 100644
--- a/data/hostname/worker09.softwareheritage.org.yaml
+++ b/data/hostname/worker09.softwareheritage.org.yaml
@@ -1,18 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.35
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.35
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_svn
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker10.softwareheritage.org.yaml b/data/hostname/worker10.softwareheritage.org.yaml
index 133a25ac..91bfda75 100644
--- a/data/hostname/worker10.softwareheritage.org.yaml
+++ b/data/hostname/worker10.softwareheritage.org.yaml
@@ -1,18 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.36
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.36
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_svn
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker11.softwareheritage.org.yaml b/data/hostname/worker11.softwareheritage.org.yaml
index 134fc1a2..a543a784 100644
--- a/data/hostname/worker11.softwareheritage.org.yaml
+++ b/data/hostname/worker11.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.37
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.37
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker12.softwareheritage.org.yaml b/data/hostname/worker12.softwareheritage.org.yaml
index f1949757..a58ec9b8 100644
--- a/data/hostname/worker12.softwareheritage.org.yaml
+++ b/data/hostname/worker12.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.38
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.38
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker13.softwareheritage.org.yaml b/data/hostname/worker13.softwareheritage.org.yaml
index b171b6a1..b6626e60 100644
--- a/data/hostname/worker13.softwareheritage.org.yaml
+++ b/data/hostname/worker13.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.39
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.39
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker14.softwareheritage.org.yaml b/data/hostname/worker14.softwareheritage.org.yaml
index 826155a5..5eab23c5 100644
--- a/data/hostname/worker14.softwareheritage.org.yaml
+++ b/data/hostname/worker14.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.40
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.40
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker15.softwareheritage.org.yaml b/data/hostname/worker15.softwareheritage.org.yaml
index 91850483..9f99847a 100644
--- a/data/hostname/worker15.softwareheritage.org.yaml
+++ b/data/hostname/worker15.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.41
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.41
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/hostname/worker16.softwareheritage.org.yaml b/data/hostname/worker16.softwareheritage.org.yaml
index da1dd80f..7d85c23c 100644
--- a/data/hostname/worker16.softwareheritage.org.yaml
+++ b/data/hostname/worker16.softwareheritage.org.yaml
@@ -1,17 +1,11 @@
 networks:
   private:
     interface: eth1
     address: 192.168.100.42
     netmask: 255.255.255.0
     gateway: 192.168.100.1
   default:
     interface: eth0
     address: 128.93.193.42
     netmask: 255.255.255.0
     gateway: 128.93.193.254
-
-swh::deploy::worker::instances:
-  - swh_loader_git
-  - swh_loader_svn
-
-swh::deploy::worker::swh_loader_git::concurrency: 10
diff --git a/data/location/azure_euwest.yaml b/data/location/azure_euwest.yaml
index e95f45a6..b1a99397 100644
--- a/data/location/azure_euwest.yaml
+++ b/data/location/azure_euwest.yaml
@@ -1,9 +1,14 @@
 ---
 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
diff --git a/data/location/sesi_rocquencourt.yaml b/data/location/sesi_rocquencourt.yaml
index 81f61097..0b52121c 100644
--- a/data/location/sesi_rocquencourt.yaml
+++ b/data/location/sesi_rocquencourt.yaml
@@ -1,12 +1,17 @@
 ---
 dns::forwarders:
   - 193.51.196.130
   - 193.51.196.131
 dns::forwarder_insecure: true
 
 ntp::servers:
   - sesi-ntp1.inria.fr
   - sesi-ntp2.inria.fr
 
 smtp::relayhost: '[smtp.inria.fr]'
 
+swh::deploy::worker::instances:
+  - swh_lister_github
+  - swh_loader_debian
+  - swh_loader_git
+  - swh_loader_svn