diff --git a/debian/control b/debian/control
index 267f6a93..477a990a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,55 +1,53 @@
 Source: swh-deposit
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python (>= 3),
-               patool,
                python3-setuptools,
                python3-all,
                python3-click,
                python3-django,
                python3-djangorestframework,
+			   python3-iso8601,
                python3-pytest,
                python3-pytest-django,
+               python3-pytest-mock,
+               python3-pytest-postgresql,
                python3-requests,
-               python3-vcversioner,
-               python3-swh.core (>= 0.0.36~),
+               python3-requests-mock,
+               python3-swh.core (>= 0.0.75~),
                python3-swh.model (>= 0.0.26~),
-               python3-swh.loader.core (>= 0.0.32~),
-               python3-swh.loader.tar (>= 0.0.39~),
+               python3-swh.loader.core (>= 0.0.71~),
                python3-swh.scheduler (>= 0.0.39~),
                python3-vcversioner,
                python3-xmltodict,
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/source/swh-deposit/
 
 Package: python3-swh.deposit
 Architecture: all
-Depends: python3-swh.core (>= 0.0.36~),
+Depends: python3-swh.core (>= 0.0.75~),
          python3-swh.model (>= 0.0.26~),
          python3-swh.scheduler (>= 0.0.39~),
-         patool,
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Server
 
 Package: python3-swh.deposit.client
 Architecture: all
-Depends: python3-swh.core (>= 0.0.36~),
+Depends: python3-swh.core (>= 0.0.75~),
          python3-swh.model (>= 0.0.26~),
          python3-requests,
          python3-xmltodict,
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Api Client
 
 Package: python3-swh.deposit.loader
-Conflict: python3-swh.deposit.injection
 Architecture: all
 Depends: python3-swh.deposit.client (= ${binary:Version}),
          python3-swh.core (>= 0.0.36~),
          python3-swh.model (>= 0.0.26~),
-         python3-swh.loader.core (>= 0.0.32~),
-         python3-swh.loader.tar (>= 0.0.39~),
+         python3-swh.loader.core (>= 0.0.71~),
          python3-swh.scheduler (>= 0.0.39~),
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Loader
diff --git a/debian/rules b/debian/rules
index 1462aa18..022b3d5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=swh.deposit
 export PYBUILD_TEST_ARGS=-v -m "not db and not 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.deposit.loader/usr/lib/python$$pyvers/dist-packages/swh/deposit/loader ; \
 		mv $(CURDIR)/debian/python3-swh.deposit/usr/lib/python$$pyvers/dist-packages/swh/deposit/loader/* \
 		   $(CURDIR)/debian/python3-swh.deposit.loader/usr/lib/python$$pyvers/dist-packages/swh/deposit/loader/ ; \
-		mkdir -p $(CURDIR)/debian/python3-swh.deposit.client/usr/lib/python$$pyvers/dist-packages/swh/deposit/client ; \
-		mv $(CURDIR)/debian/python3-swh.deposit/usr/lib/python$$pyvers/dist-packages/swh/deposit/client/* \
-		   $(CURDIR)/debian/python3-swh.deposit.client/usr/lib/python$$pyvers/dist-packages/swh/deposit/client/ ; \
+		mkdir -p $(CURDIR)/debian/python3-swh.deposit.client/usr/lib/python$$pyvers/dist-packages/swh/deposit ; \
+		mv $(CURDIR)/debian/python3-swh.deposit/usr/lib/python$$pyvers/dist-packages/swh/deposit/client.py\
+		   $(CURDIR)/debian/python3-swh.deposit.client/usr/lib/python$$pyvers/dist-packages/swh/deposit/ ; \
 	done
-
-override_dh_auto_test: