diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf
index a42bef7e5d..3cd32c5b3e 100644
--- a/tools/docker-compose/supervisor.conf
+++ b/tools/docker-compose/supervisor.conf
@@ -7,6 +7,10 @@ nodaemon=true
 command = make dispatcher
 autostart = true
 autorestart = true
+stopwaitsecs = 1
+stopsignal=KILL
+stopasgroup=true
+killasgroup=true
 redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
@@ -15,6 +19,10 @@ stdout_logfile_maxbytes=0
 command = make receiver
 autostart = true
 autorestart = true
+stopwaitsecs = 1
+stopsignal=KILL
+stopasgroup=true
+killasgroup=true
 redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0