diff --git a/data/hostname/worker17.softwareheritage.org.yaml b/data/hostname/worker17.softwareheritage.org.yaml
--- a/data/hostname/worker17.softwareheritage.org.yaml
+++ b/data/hostname/worker17.softwareheritage.org.yaml
@@ -6,10 +6,10 @@
 swh::deploy::worker::loader_oneshot::concurrency: 1
 swh::deploy::worker::loader_oneshot::max_tasks_per_child: 1
 swh::deploy::worker::loader_oneshot::task_queues:
-  - oneshot:swh.loader.git.tasks.UpdateGitRepository
+  - oneshot2:swh.loader.git.tasks.UpdateGitRepository
 
 # T4400: loader-git for large repositories (normal is done)
-swh::deploy::worker::loader_git::concurrency: 1
+swh::deploy::worker::loader_git::concurrency: 5
 swh::deploy::worker::loader_git::max_tasks_per_child: 1
 swh::deploy::loader_git::queues:
   - oneshot:swh.loader.git.tasks.UpdateGitRepository
diff --git a/data/hostname/worker18.softwareheritage.org.yaml b/data/hostname/worker18.softwareheritage.org.yaml
--- a/data/hostname/worker18.softwareheritage.org.yaml
+++ b/data/hostname/worker18.softwareheritage.org.yaml
@@ -6,10 +6,10 @@
 swh::deploy::worker::loader_oneshot::concurrency: 1
 swh::deploy::worker::loader_oneshot::max_tasks_per_child: 1
 swh::deploy::worker::loader_oneshot::task_queues:
-  - oneshot:swh.loader.git.tasks.UpdateGitRepository
+  - oneshot2:swh.loader.git.tasks.UpdateGitRepository
 
 # T4400: loader-git for large repositories (normal is done)
-swh::deploy::worker::loader_git::concurrency: 1
+swh::deploy::worker::loader_git::concurrency: 5
 swh::deploy::worker::loader_git::max_tasks_per_child: 1
 swh::deploy::loader_git::queues:
   - oneshot:swh.loader.git.tasks.UpdateGitRepository
diff --git a/site-modules/profile/manifests/swh/deploy/scrubber/checker/postgres.pp b/site-modules/profile/manifests/swh/deploy/scrubber/checker/postgres.pp
--- a/site-modules/profile/manifests/swh/deploy/scrubber/checker/postgres.pp
+++ b/site-modules/profile/manifests/swh/deploy/scrubber/checker/postgres.pp
@@ -53,7 +53,7 @@
 
   # As many services as there are dbs to scrub
   $config_per_dbs_to_scrub.each | $db_name, $cfg | {
-    $config_file = "${config_dir}/${db_name}.yaml"
+    $config_file = "${config_dir}/${db_name}.yml"
     $config_dict = $cfg['config']
     file {$config_file:
       ensure  => present,