diff --git a/requirements-swh.txt b/requirements-swh.txt
index f4b15d8..9a0ef3e 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1,5 @@
-swh.core[db,http] >= 0.0.60
+swh.core[db,http] >= 0.0.61
 swh.model >= 0.0.27
 swh.objstorage >= 0.0.17
 swh.scheduler >= 0.0.39
 swh.storage >= 0.0.106
diff --git a/swh/vault/cli.py b/swh/vault/cli.py
index 9c902bc..9129cf4 100644
--- a/swh/vault/cli.py
+++ b/swh/vault/cli.py
@@ -1,51 +1,60 @@
 import logging
 
 import click
-import aiohttp
 
-from swh.vault.api.server import make_app_from_configfile
+from swh.core.cli import CONTEXT_SETTINGS, AliasedGroup
 
 
-CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+@click.group(name='vault', context_settings=CONTEXT_SETTINGS,
+             cls=AliasedGroup)
+@click.pass_context
+def vault(ctx):
+    '''Software Heritage Vault tools.'''
+    pass
 
 
-@click.command(name='vault', context_settings=CONTEXT_SETTINGS)
+@vault.command(name='rpc-serve')
 @click.option('--config-file', '-C', default=None,
               type=click.Path(exists=True, dir_okay=False,),
               help="Configuration file.")
 @click.option('--no-stdout', is_flag=True, default=False,
               help="Do NOT output logs on the console")
 @click.option('--host', default='0.0.0.0', help="Host to run the server")
 @click.option('--port', default=5005, type=click.INT,
               help="Binding port of the server")
 @click.option('--debug/--no-debug', default=True,
               help="Indicates if the server should run in debug mode")
 @click.pass_context
-def cli(ctx, config_file, no_stdout, host, port, debug):
+def serve(ctx, config_file, no_stdout, host, port, debug):
     """Software Heritage Vault API server
 
     """
+    import aiohttp
     from swh.scheduler.celery_backend.config import setup_log_handler
+    from swh.vault.api.server import make_app_from_configfile
 
     ctx.ensure_object(dict)
     setup_log_handler(
         loglevel=ctx.obj.get('log_level', logging.INFO), colorize=False,
         format='[%(levelname)s] %(name)s -- %(message)s',
         log_console=not no_stdout)
 
     try:
         app = make_app_from_configfile(config_file, debug=debug)
     except EnvironmentError as e:
         click.echo(e.msg, err=True)
         ctx.exit(1)
 
     aiohttp.web.run_app(app, host=host, port=int(port))
 
 
+vault.add_alias(serve, 'serve')
+
+
 def main():
     logging.basicConfig()
-    return cli(auto_envvar_prefix='SWH_VAULT')
+    return serve(auto_envvar_prefix='SWH_VAULT')
 
 
 if __name__ == '__main__':
     main()