diff --git a/service/biboumi/quadlet/biboumi.container b/service/biboumi/quadlet/biboumi.container
index e1d7438..44a6af6 100644
--- a/service/biboumi/quadlet/biboumi.container
+++ b/service/biboumi/quadlet/biboumi.container
@@ -1,7 +1,9 @@
 [Unit]
 Description=Biboumi IRC Gateway for XMPP
 Wants=container-build@%N.service container-volume@%N.service prosody.service prosody-component-register@%N.service
-After=container-build@%N.service container-volume@%N.service prosody.service prosody-component-register@%N.service
+After=container-build@%N.service container-volume@%N.service prosody.service
+Before=prosody-component-register@%N.service
+PropagatesStopTo=prosody-component-register@%p-%i.service
 
 [Container]
 ContainerName=%N
diff --git a/service/slidge/systemd/slidge@.service b/service/slidge/systemd/slidge@.service
index 76df1e7..c945de7 100644
--- a/service/slidge/systemd/slidge@.service
+++ b/service/slidge/systemd/slidge@.service
@@ -1,7 +1,9 @@
 [Unit]
 Description=Slidge Gateway for XMPP (%i)
 Wants=container-build@%p.service container-volume@%p-%i.service prosody.service prosody-component-register@%p-%i.service
-After=container-build@%p.service container-volume@%p-%i.service prosody.service prosody-component-register@%p-%i.service
+After=container-build@%p.service container-volume@%p-%i.service prosody.service
+Before=prosody-component-register@%p-%i.service
+PropagatesStopTo=prosody-component-register@%p-%i.service
 
 [Service]
 Type=notify