diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,3 +1,3 @@
-swh.core[db,http] >= 0.2.0
+swh.core[db,http] >= 0.3
 swh.model >= 0.6.6
 swh.objstorage >= 0.0.40
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -49,10 +49,8 @@
     use_scm_version=True,
     scripts=["bin/swh-storage-add-dir",],
     entry_points="""
-        [console_scripts]
-        swh-storage=swh.storage.cli:main
         [swh.cli.subcommands]
-        storage=swh.storage.cli:storage
+        storage=swh.storage.cli
     """,
     install_requires=parse_requirements() + parse_requirements("swh"),
     extras_require={
diff --git a/swh/storage/cli.py b/swh/storage/cli.py
--- a/swh/storage/cli.py
+++ b/swh/storage/cli.py
@@ -11,7 +11,7 @@
 
 import click
 
-from swh.core.cli import CONTEXT_SETTINGS
+from swh.core.cli import CONTEXT_SETTINGS, swh as swh_cli_group
 
 try:
     from systemd.daemon import notify
@@ -19,7 +19,7 @@
     notify = None
 
 
-@click.group(name="storage", context_settings=CONTEXT_SETTINGS)
+@swh_cli_group.group(name="storage", context_settings=CONTEXT_SETTINGS)
 @click.option(
     "--config-file",
     "-C",