diff --git a/data/hostname/worker01.softwareheritage.org.yaml b/data/hostname/worker01.softwareheritage.org.yaml
index e32114a8..a1780170 100644
--- a/data/hostname/worker01.softwareheritage.org.yaml
+++ b/data/hostname/worker01.softwareheritage.org.yaml
@@ -1,51 +1,17 @@
 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
   - swh_reader_git
   - swh_loader_svn
-
-swh::deploy::worker::swh_storage_archiver_azure::concurrency: 1
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker02.softwareheritage.org.yaml b/data/hostname/worker02.softwareheritage.org.yaml
index 5ff36b83..b86d8565 100644
--- a/data/hostname/worker02.softwareheritage.org.yaml
+++ b/data/hostname/worker02.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker03.softwareheritage.org.yaml b/data/hostname/worker03.softwareheritage.org.yaml
index 78854371..5f1218cc 100644
--- a/data/hostname/worker03.softwareheritage.org.yaml
+++ b/data/hostname/worker03.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker04.softwareheritage.org.yaml b/data/hostname/worker04.softwareheritage.org.yaml
index 5014c06b..676c6f3c 100644
--- a/data/hostname/worker04.softwareheritage.org.yaml
+++ b/data/hostname/worker04.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker05.softwareheritage.org.yaml b/data/hostname/worker05.softwareheritage.org.yaml
index fbf6d86b..8a2b1879 100644
--- a/data/hostname/worker05.softwareheritage.org.yaml
+++ b/data/hostname/worker05.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker06.softwareheritage.org.yaml b/data/hostname/worker06.softwareheritage.org.yaml
index 650a5422..4d4baf0b 100644
--- a/data/hostname/worker06.softwareheritage.org.yaml
+++ b/data/hostname/worker06.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker07.softwareheritage.org.yaml b/data/hostname/worker07.softwareheritage.org.yaml
index 35c40b70..fac99d35 100644
--- a/data/hostname/worker07.softwareheritage.org.yaml
+++ b/data/hostname/worker07.softwareheritage.org.yaml
@@ -1,48 +1,16 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50
diff --git a/data/hostname/worker08.softwareheritage.org.yaml b/data/hostname/worker08.softwareheritage.org.yaml
index f3dd9bbd..7f2c9bcf 100644
--- a/data/hostname/worker08.softwareheritage.org.yaml
+++ b/data/hostname/worker08.softwareheritage.org.yaml
@@ -1,51 +1,19 @@
 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
-
-#### loader-svn testing
-swh::deploy::storage::db::dbname: softwareheritage-test-svn
-swh::deploy::storage::config:
-  storage:
-    cls: local
-    args:
-      db: "host=%{hiera('swh::deploy::storage::db::host')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
-      objstorage:
-        cls: remote
-        args:
-          url: "http://uffizi.internal.softwareheritage.org:5003/"
-
-swh::deploy::worker::swh_loader_svn::loglevel: debug
-swh::deploy::worker::swh_loader_svn::config:
-  storage:
-    cls: remote
-    args:
-      url: http://127.0.0.1:5002/
-  send_contents: true
-  send_directories: true
-  send_revisions: true
-  send_releases: true
-  send_occurrences: true
-  content_packet_size: 1000
-  content_packet_block_size_bytes: 104857600
-  content_packet_size_bytes: 1073741824
-  directory_packet_size: 250
-  revision_packet_size: 100
-  release_packet_size: 100
-  occurrence_packet_size: 100
-  check_revision: 50