diff --git a/debian/control b/debian/control
index c49c39d..44a4d6b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,35 +1,47 @@
 Source: swh-indexer
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python (>= 2),
                python3-all,
                python3-chardet (>= 2.3.0~),
                python3-click,
                python3-nose,
                python3-pygments,
                python3-magic,
                python3-setuptools,
                python3-swh.core (>= 0.0.27~),
                python3-swh.model (>= 0.0.15~),
                python3-swh.objstorage (>= 0.0.13~),
                python3-swh.scheduler (>= 0.0.14~),
                python3-swh.storage (>= 0.0.93~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/78/
 
-Package: python3-swh.indexer
+Package: python3-swh.indexer.storage
 Architecture: all
-Depends: fossology-nomossa (>= 3.1~),
+Depends: python3-swh.core (>= 0.0.27~),
+         python3-swh.model (>= 0.0.15~),
+         python3-swh.objstorage (>= 0.0.13~),
          python3-swh.scheduler (>= 0.0.14~),
+         python3-swh.storage (>= 0.0.93~),
+         ${misc:Depends},
+         ${python3:Depends}
+Description: Software Heritage Content Indexer Storage
+
+Package: python3-swh.indexer
+Architecture: all
+Depends: python3-swh.scheduler (>= 0.0.14~),
          python3-swh.core (>= 0.0.27~),
          python3-swh.model (>= 0.0.15~),
          python3-swh.objstorage (>= 0.0.13~),
          python3-swh.scheduler (>= 0.0.14~),
          python3-swh.storage (>= 0.0.93~),
+         python3-swh.storage.indexer (= ${binary:Version}),
          universal-ctags (>= 0.8~),
+         fossology-nomossa (>= 3.1~),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage Content Indexer
diff --git a/debian/rules b/debian/rules
index aa268db..0b0f59f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=swh.indexer
 export PYBUILD_TEST_ARGS=-sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_install:
 	dh_install
 	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
+	for pyvers in $(shell py3versions -vr); do \
+		mkdir -p $(CURDIR)/debian/python3-swh.indexer.storage/usr/lib/python$$pyvers/dist-packages/swh/indexer/storage/ ; \
+		mv $(CURDIR)/debian/python3-swh.indexer/usr/lib/python$$pyvers/dist-packages/swh/indexer/storage/* \
+		   $(CURDIR)/debian/python3-swh.indexer.storage/usr/lib/python$$pyvers/dist-packages/swh/indexer/storage/ ; \
+	done