diff --git a/debian/control b/debian/control
index d386d59fa..8c14e79dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,24 @@
 Source: swh-storage
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                python3-all,
                python3-dateutil,
                python3-flask,
                python3-nose,
                python3-psycopg2,
                python3-requests,
                python3-setuptools,
                python3-swh.core (>= 0.0.17~),
-               python3-vcversioner
+               python3-vcversioner,
+               python3-swh.scheduler,
+               python3-click
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DSTO/
 
 Package: python3-swh.storage
 Architecture: all
 Depends: python3-swh.core (>= 0.0.17~), ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage storage utilities
diff --git a/requirements.txt b/requirements.txt
index 4f10697eb..faeaec3b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,15 @@
 dateutil
 psycopg2
 vcversioner
 
 # remote storage API client
 requests
 
 # remote storage API server
 flask
 
 # Internal dependencies
 swh.core >= 0.0.17
+
+click
+swh.scheduler
diff --git a/setup.py b/setup.py
index 292e7c222..145e35901 100644
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,41 @@
 #!/usr/bin/env python3
 
 from setuptools import setup
 
 
 def parse_requirements():
     requirements = []
     with open('requirements.txt') 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.storage',
     description='Software Heritage storage manager',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DSTO/',
-    packages=['swh.storage', 'swh.storage.api', 'swh.storage.tests'],
+    packages=[
+        'swh.storage',
+        'swh.storage.archiver',
+        'swh.storage.api',
+        'swh.storage.objstorage',
+        'swh.storage.objstorage.api',
+        'swh.storage.tests',
+    ],
     scripts=[
         'bin/swh-objstorage-add-dir',
         'bin/swh-objstorage-fsck',
         'bin/swh-storage-add-dir',
     ],
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
     vcversioner={},
     include_package_data=True,
 )