diff --git a/seirl/dev-services/dev-celery-vault.service b/seirl/dev-services/dev-celery-vault.service
index 7801a8e..aabbe56 100644
--- a/seirl/dev-services/dev-celery-vault.service
+++ b/seirl/dev-services/dev-celery-vault.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Dev celery vault
+PartOf=dev-swh.target
 
 [Service]
 Environment=SWH_WORKER_INSTANCE=vault
 ExecStart=%h/swh-environment/.venv/bin/python3 -m celery worker --app swh.scheduler.celery_backend.config.app --pool=prefork --concurrency=1 -Ofair --loglevel=debug --without-mingle --without-gossip
 
 [Install]
 WantedBy=dev-swh.target
diff --git a/seirl/dev-services/dev-listener.service b/seirl/dev-services/dev-listener.service
index dac1af5..4abd65c 100644
--- a/seirl/dev-services/dev-listener.service
+++ b/seirl/dev-services/dev-listener.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Dev listener
+PartOf=dev-swh.target
 
 [Service]
 ExecStart=%h/swh-environment/.venv/bin/python3 -m swh.scheduler.celery_backend.listener
 
 [Install]
 WantedBy=dev-swh.target
diff --git a/seirl/dev-services/dev-runner.service b/seirl/dev-services/dev-runner.service
index b2a94e0..fde0658 100644
--- a/seirl/dev-services/dev-runner.service
+++ b/seirl/dev-services/dev-runner.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Dev listener
+PartOf=dev-swh.target
 
 [Service]
 RestartSec=1
 ExecStart=%h/swh-environment/.venv/bin/python3 -m swh.scheduler.celery_backend.runner
 
 [Install]
 WantedBy=dev-swh.target
diff --git a/seirl/dev-services/dev-storage.service b/seirl/dev-services/dev-storage.service
index a62cacd..a5ccb55 100644
--- a/seirl/dev-services/dev-storage.service
+++ b/seirl/dev-services/dev-storage.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Dev storage
+PartOf=dev-swh.target
 
 [Service]
 ExecStart=%h/swh-environment/.venv/bin/python3 -m swh.storage.api.server %h/.config/swh/storage/storage.yml
 
 [Install]
 WantedBy=dev-swh.target
diff --git a/seirl/dev-services/dev-vault.service b/seirl/dev-services/dev-vault.service
index 1cfd80b..4a32c91 100644
--- a/seirl/dev-services/dev-vault.service
+++ b/seirl/dev-services/dev-vault.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Dev vault
+PartOf=dev-swh.target
 
 [Service]
 ExecStart=%h/swh-environment/.venv/bin/python3 -m swh.vault.api.server %h/.config/swh/storage/vault.yml
 
 [Install]
 WantedBy=dev-swh.target
diff --git a/seirl/dev-services/dev-webapp.service b/seirl/dev-services/dev-webapp.service
index f23e48a..af58783 100644
--- a/seirl/dev-services/dev-webapp.service
+++ b/seirl/dev-services/dev-webapp.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Dev webapp
+PartOf=dev-swh.target
 
 [Service]
 ExecStart=%h/swh-environment/.venv/bin/python3 -m swh.web.manage runserver 0.0.0.0:5004 -v 3
 
 [Install]
 WantedBy=dev-swh.target