diff --git a/requirements-swh.txt b/requirements-swh.txt
index cfb397d..b8b4b27 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,2 +1,2 @@
-swh.core[db,http] >= 0.0.65
+swh.core[db,http] >= 0.3
 swh.storage >= 0.11.1
diff --git a/setup.py b/setup.py
index ec39d15..b216dce 100755
--- a/setup.py
+++ b/setup.py
@@ -1,72 +1,70 @@
 #!/usr/bin/env python3
 # Copyright (C) 2015-2019  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 io import open
 from os import path
 
 from setuptools import find_packages, setup
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
 
 def parse_requirements(name=None):
     if name:
         reqf = "requirements-%s.txt" % name
     else:
         reqf = "requirements.txt"
 
     requirements = []
     if not path.exists(reqf):
         return requirements
 
     with open(reqf) as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith("#"):
                 continue
             requirements.append(line)
     return requirements
 
 
 setup(
     name="swh.scheduler",
     description="Software Heritage Scheduler",
     long_description=long_description,
     long_description_content_type="text/markdown",
     python_requires=">=3.7",
     author="Software Heritage developers",
     author_email="swh-devel@inria.fr",
     url="https://forge.softwareheritage.org/diffusion/DSCH/",
     packages=find_packages(),
     setup_requires=["setuptools-scm"],
     use_scm_version=True,
     install_requires=parse_requirements() + parse_requirements("swh"),
     extras_require={"testing": parse_requirements("test")},
     include_package_data=True,
     entry_points="""
-        [console_scripts]
-        swh-scheduler=swh.scheduler.cli:main
         [swh.cli.subcommands]
-        scheduler=swh.scheduler.cli:cli
+        scheduler=swh.scheduler.cli
     """,
     classifiers=[
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
         "Development Status :: 5 - Production/Stable",
     ],
     project_urls={
         "Bug Reports": "https://forge.softwareheritage.org/maniphest",
         "Funding": "https://www.softwareheritage.org/donate",
         "Source": "https://forge.softwareheritage.org/source/swh-scheduler",
         "Documentation": "https://docs.softwareheritage.org/devel/swh-scheduler/",
     },
 )
diff --git a/swh/scheduler/cli/__init__.py b/swh/scheduler/cli/__init__.py
index eb4db7c..2343f79 100644
--- a/swh/scheduler/cli/__init__.py
+++ b/swh/scheduler/cli/__init__.py
@@ -1,93 +1,95 @@
 # Copyright (C) 2016-2020  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
 
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # control
 import logging
 
 import click
 
-from swh.core.cli import CONTEXT_SETTINGS, AliasedGroup
+from swh.core.cli import CONTEXT_SETTINGS, AliasedGroup, swh as swh_cli_group
 
 
-@click.group(name="scheduler", context_settings=CONTEXT_SETTINGS, cls=AliasedGroup)
+@swh_cli_group.group(
+    name="scheduler", context_settings=CONTEXT_SETTINGS, cls=AliasedGroup
+)
 @click.option(
     "--config-file",
     "-C",
     default=None,
     type=click.Path(exists=True, dir_okay=False,),
     help="Configuration file.",
 )
 @click.option(
     "--database",
     "-d",
     default=None,
     help="Scheduling database DSN (imply cls is 'local')",
 )
 @click.option(
     "--url", "-u", default=None, help="Scheduler's url access (imply cls is 'remote')"
 )
 @click.option(
     "--no-stdout", is_flag=True, default=False, help="Do NOT output logs on the console"
 )
 @click.pass_context
 def cli(ctx, config_file, database, url, no_stdout):
     """Software Heritage Scheduler tools.
 
     Use a local scheduler instance by default (plugged to the
     main scheduler db).
     """
     try:
         from psycopg2 import OperationalError
     except ImportError:
 
         class OperationalError(Exception):
             pass
 
     from swh.core import config
     from swh.scheduler import DEFAULT_CONFIG, get_scheduler
 
     ctx.ensure_object(dict)
 
     logger = logging.getLogger(__name__)
     scheduler = None
     conf = config.read(config_file, DEFAULT_CONFIG)
     if "scheduler" not in conf:
         raise ValueError("missing 'scheduler' configuration")
 
     if database:
         conf["scheduler"]["cls"] = "local"
         conf["scheduler"]["args"]["db"] = database
     elif url:
         conf["scheduler"]["cls"] = "remote"
         conf["scheduler"]["args"] = {"url": url}
     sched_conf = conf["scheduler"]
     try:
         logger.debug("Instantiating scheduler with %s" % (sched_conf))
         scheduler = get_scheduler(**sched_conf)
     except (ValueError, OperationalError):
         # it's the subcommand to decide whether not having a proper
         # scheduler instance is a problem.
         pass
 
     ctx.obj["scheduler"] = scheduler
     ctx.obj["config"] = conf
 
 
 from . import admin, celery_monitor, task, task_type  # noqa
 
 
 def main():
     import click.core
 
     click.core.DEPRECATED_HELP_NOTICE = """
 
 DEPRECATED! Please use the command 'swh scheduler'."""
     cli.deprecated = True
     return cli(auto_envvar_prefix="SWH_SCHEDULER")
 
 
 if __name__ == "__main__":
     main()