diff --git a/data/hostname/worker17.softwareheritage.org.yaml b/data/hostname/worker17.softwareheritage.org.yaml
index 079ef18c..5693b7c2 100644
--- a/data/hostname/worker17.softwareheritage.org.yaml
+++ b/data/hostname/worker17.softwareheritage.org.yaml
@@ -1,25 +1,27 @@
 swh::deploy::worker::instances:
   - loader_oneshot
   - loader_git
 
 swh::deploy::worker::loader_oneshot::concurrency: 20
+swh::deploy::worker::loader_oneshot::max_tasks_per_child: 1
 swh::deploy::worker::loader_oneshot::task_queues:
   # loader-git
   - oneshot:swh.loader.git.tasks.UpdateGitRepository
   - oneshot3:swh.loader.git.tasks.UpdateGitRepository
   # mercurial
   - oneshot:swh.loader.mercurial.tasks.LoadMercurial
   - oneshot:swh.loader.mercurial.tasks.LoadArchiveMercurial
   # svn
   - oneshot:swh.loader.svn.tasks.LoadSvnRepository
   - oneshot:swh.loader.svn.tasks.MountAndLoadSvnRepository
   - oneshot:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
 
 # Make the loader git service consume from a queue dedicated to subside lag
 swh::deploy::loader_git::queues:
   - oneshot3:swh.loader.git.tasks.UpdateGitRepository
 
 swh::deploy::worker::loader_git::concurrency: 10
+swh::deploy::worker::loader_git::max_tasks_per_child: 1
 
 icinga2::host::vars:
   load: high
diff --git a/data/hostname/worker18.softwareheritage.org.yaml b/data/hostname/worker18.softwareheritage.org.yaml
index 346bd361..55a5b486 100644
--- a/data/hostname/worker18.softwareheritage.org.yaml
+++ b/data/hostname/worker18.softwareheritage.org.yaml
@@ -1,22 +1,24 @@
 swh::deploy::worker::instances:
   - loader_oneshot
   - loader_git
 
 swh::deploy::worker::loader_oneshot::concurrency: 7
+swh::deploy::worker::loader_oneshot::max_tasks_per_child: 1
 swh::deploy::worker::loader_oneshot::task_queues:
   # loader-git
   - oneshot3:swh.loader.git.tasks.UpdateGitRepository
   - oneshot2:swh.loader.git.tasks.UpdateGitRepository
   # mercurial
   - oneshot2:swh.loader.mercurial.tasks.LoadMercurial
   - oneshot2:swh.loader.mercurial.tasks.LoadArchiveMercurial
   # svn
   - oneshot2:swh.loader.svn.tasks.LoadSvnRepository
   - oneshot2:swh.loader.svn.tasks.MountAndLoadSvnRepository
   - oneshot2:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
 
 # Make the loader git service consume from a queue dedicated to subside lag
 swh::deploy::loader_git::queues:
   - oneshot3:swh.loader.git.tasks.UpdateGitRepository
 
 swh::deploy::worker::loader_git::concurrency: 7
+swh::deploy::worker::loader_git::max_tasks_per_child: 1