diff --git a/debian/control b/debian/control
index 6a6d5ed..8164123 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,26 @@
 Source: swh-scheduler
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python (>= 2),
                python3-all,
                python3-arrow,
                python3-celery,
                python3-click,
                python3-elasticsearch (>= 5.4.0),
                python3-flask,
                python3-hypothesis,
                python3-kombu,
                python3-nose,
                python3-psycopg2,
                python3-setuptools,
-               python3-swh.core (>= 0.0.38~),
+               python3-swh.core (>= 0.0.40~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DSCH/
 
 Package: python3-swh.scheduler
 Architecture: all
 Depends: python3-swh.core (>= 0.0.38~), ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Scheduler
diff --git a/requirements-swh.txt b/requirements-swh.txt
index a152b02..9e6b6d1 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1 +1 @@
-swh.core >= 0.0.38
+swh.core >= 0.0.40
diff --git a/swh/scheduler/api/client.py b/swh/scheduler/api/client.py
index 9b3baac..dbb9641 100644
--- a/swh/scheduler/api/client.py
+++ b/swh/scheduler/api/client.py
@@ -1,107 +1,108 @@
 # Copyright (C) 2018  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 from swh.core.api import SWHRemoteAPI
 
 
 class SchedulerAPIError(Exception):
     """Specific internal scheduler api issue (mainly connection)
 
     """
 
     def __str__(self):
         args = self.args
         return 'An unexpected error occurred in the api backend: %s' % args
 
 
 class RemoteScheduler(SWHRemoteAPI):
     """Proxy to a remote scheduler API
 
     """
-    def __init__(self, url):
-        super().__init__(api_exception=SchedulerAPIError, url=url)
+    def __init__(self, url, timeout=None):
+        super().__init__(
+            api_exception=SchedulerAPIError, url=url, timeout=timeout)
 
     def close_connection(self):
         return self.post('close_connection', {})
 
     def set_status_tasks(self, task_ids, status='disabled'):
         return self.post('set_status_tasks', {'task_ids': task_ids,
                                               'status': status})
 
     def create_task_type(self, task_type):
         return self.post('create_task_type', {'task_type': task_type})
 
     def get_task_type(self, task_type_name):
         return self.post('get_task_type', {'task_type_name': task_type_name})
 
     def get_task_types(self):
         return self.post('get_task_types', {})
 
     def create_tasks(self, tasks):
         return self.post('create_tasks', {'tasks': tasks})
 
     def disable_tasks(self, task_ids):
         return self.post('disable_tasks', {'task_ids': task_ids})
 
     def get_tasks(self, task_ids):
         return self.post('get_tasks', {'task_ids': task_ids})
 
     def peek_ready_tasks(self, task_type, timestamp=None, num_tasks=None,
                          num_tasks_priority=None):
         return self.post('peek_ready_tasks', {
             'task_type': task_type,
             'timestamp': timestamp,
             'num_tasks': num_tasks,
             'num_tasks_priority': num_tasks_priority,
         })
 
     def grab_ready_tasks(self, task_type, timestamp=None, num_tasks=None,
                          num_tasks_priority=None):
         return self.post('grab_ready_tasks', {
             'task_type': task_type,
             'timestamp': timestamp,
             'num_tasks': num_tasks,
             'num_tasks_priority': num_tasks_priority,
         })
 
     def schedule_task_run(self, task_id, backend_id, metadata=None,
                           timestamp=None):
         return self.post('schedule_task_run', {
             'task_id': task_id,
             'backend_id': backend_id,
             'metadata': metadata,
             'timestamp': timestamp,
         })
 
     def mass_schedule_task_runs(self, task_runs):
         return self.post('mass_schedule_task_runs', {'task_runs': task_runs})
 
     def start_task_run(self, backend_id, metadata=None, timestamp=None):
         return self.post('start_task_run', {
             'backend_id': backend_id,
             'metadata': metadata,
             'timestamp': timestamp,
         })
 
     def end_task_run(self, backend_id, status, metadata=None, timestamp=None):
         return self.post('end_task_run', {
             'backend_id': backend_id,
             'status': status,
             'metadata': metadata,
             'timestamp': timestamp,
         })
 
     def filter_task_to_archive(self, after_ts, before_ts, limit=10,
                                last_id=-1):
         return self.post('filter_task_to_archive', {
             'after_ts': after_ts,
             'before_ts': before_ts,
             'limit': limit,
             'last_id': last_id,
         })
 
     def delete_archived_tasks(self, task_ids):
         return self.post('delete_archived_tasks', {'task_ids': task_ids})