diff --git a/requirements-swh.txt b/requirements-swh.txt
index a06e8fdd..5b2ae58a 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1 +1 @@
-swh.core[http] >= 0.0.75
+swh.core >= 0.3
diff --git a/setup.py b/setup.py
index f04dc4bc..566feef9 100755
--- a/setup.py
+++ b/setup.py
@@ -1,79 +1,79 @@
 #!/usr/bin/env python3
 # Copyright (C) 2015-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
 
 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(*names):
     requirements = []
     for name in names:
         if name:
             reqf = "requirements-%s.txt" % name
         else:
             reqf = "requirements.txt"
 
         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.deposit",
     description="Software Heritage Deposit Server",
     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/source/swh-deposit/",
     packages=find_packages(),
     install_requires=parse_requirements(None, "swh"),
     tests_require=parse_requirements("test"),
     setup_requires=["setuptools-scm"],
     use_scm_version=True,
     extras_require={
         "testing": parse_requirements("test", "server", "swh-server"),
         "server": parse_requirements("server", "swh-server"),
     },
     include_package_data=True,
     entry_points="""
         [console_scripts]
         swh-deposit=swh.deposit.cli:main
         [swh.cli.subcommands]
-        deposit=swh.deposit.cli:deposit
+        deposit=swh.deposit.cli
         [swh.workers]
         deposit.worker=swh.deposit.loader:register
     """,
     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-deposit",
         "Documentation": "https://docs.softwareheritage.org/devel/swh-deposit/",
     },
 )
diff --git a/swh/deposit/cli/__init__.py b/swh/deposit/cli/__init__.py
index 7a5473b5..b13d0e5b 100644
--- a/swh/deposit/cli/__init__.py
+++ b/swh/deposit/cli/__init__.py
@@ -1,43 +1,43 @@
 # Copyright (C) 2017-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
 
 import logging
 
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # control
 import click
 
-from swh.core.cli import CONTEXT_SETTINGS
+from swh.core.cli import CONTEXT_SETTINGS, swh as swh_cli_group
 
 logger = logging.getLogger(__name__)
 
 
-@click.group(context_settings=CONTEXT_SETTINGS)
+@swh_cli_group.group(context_settings=CONTEXT_SETTINGS)
 @click.pass_context
 def deposit(ctx):
     """Deposit main command
     """
     ctx.ensure_object(dict)
     log_level = ctx.obj.get("log_level", logging.INFO)
     logger.setLevel(log_level)
 
 
 def main():
     logging.basicConfig()
     return deposit(auto_envvar_prefix="SWH_DEPOSIT")
 
 
 # These import statements MUST be executed after defining the 'deposit' group
 # since the subcommands in these are defined using this 'deposit' group.
 from . import client  # noqa
 
 try:
     from . import admin  # noqa
 except ImportError:  # server part is optional
     logger.debug("admin subcommand not loaded")
 
 
 if __name__ == "__main__":
     main()