diff --git a/files/swh/deploy/worker/swh-worker@.service b/files/swh/deploy/worker/swh-worker@.service
index 0812db80..ef55b70e 100644
--- a/files/swh/deploy/worker/swh-worker@.service
+++ b/files/swh/deploy/worker/swh-worker@.service
@@ -1,23 +1,24 @@
 [Unit]
 Description=Software Heritage Worker (%i)
 After=network.target
 
 [Service]
 User=swhworker
 Group=swhworker
 
 Type=simple
 Environment=SWH_WORKER_INSTANCE=%i
 Environment=CONCURRENCY=10
 Environment=MAX_TASKS_PER_CHILD=5
 Environment=LOGLEVEL=info
 ExecStart=/usr/bin/python3 -m celery worker --app=swh.scheduler.celery_backend.config.app --pool=prefork --events --concurrency=${CONCURRENCY} --maxtasksperchild=${MAX_TASKS_PER_CHILD} -Ofair --loglevel=${LOGLEVEL} --without-gossip --without-mingle --without-heartbeat -n %i.%%h
 
 KillMode=process
 KillSignal=SIGTERM
 TimeoutStopSec=0
 
 Restart=always
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb b/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
index 626079e7..86b56d81 100644
--- a/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
+++ b/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
@@ -1,18 +1,19 @@
 # Scheduler Listener unit file
 # Managed by puppet class profile::swh::deploy::scheduler
 # Changes will be overwritten
 
 [Unit]
 Description=Software Heritage scheduler listener
 Requires=network.target rabbitmq-server.service
 After=network.target rabbitmq-server.service
 
 [Service]
 User=<%= @user %>
 Group=<%= @group %>
 Type=simple
 ExecStart=/usr/bin/python3 -m swh.scheduler.celery_backend.listener
 Restart=always
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb b/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
index 8a738753..cc6ec84a 100644
--- a/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
+++ b/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
@@ -1,18 +1,19 @@
 # Scheduler Runner unit file
 # Managed by puppet class profile::swh::deploy::scheduler
 # Changes will be overwritten
 
 [Unit]
 Description=Software Heritage scheduler runner
 Requires=network.target rabbitmq-server.service
 After=network.target rabbitmq-server.service
 
 [Service]
 User=<%= @user %>
 Group=<%= @group %>
 Type=simple
 ExecStart=/bin/sh -c 'while true; do echo running pending tasks at `/bin/date`...; /usr/bin/python3 -m swh.scheduler.celery_backend.runner; sleep 10; done'
 Restart=always
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target