diff --git a/compose.yml b/compose.yml
index 0b6b526b..5ff68bd3 100644
--- a/compose.yml
+++ b/compose.yml
@@ -204,6 +204,7 @@ services:
   takahe-stator:
     <<: *neodb-service
     command: takahe-manage runstator
+    stop_signal: SIGINT
     depends_on:
       migration:
         condition: service_completed_successfully
@@ -239,6 +240,7 @@ services:
   dev-neodb-web:
     <<: *dev-neodb-service
     command: neodb-manage runserver 0.0.0.0:8000
+    stop_signal: SIGINT
 
   dev-neodb-worker:
     <<: *dev-neodb-service
@@ -247,10 +249,12 @@ services:
   dev-takahe-web:
     <<: *dev-neodb-service
     command: takahe-manage runserver 0.0.0.0:8000
+    stop_signal: SIGINT
 
   dev-takahe-stator:
     <<: *dev-neodb-service
     command: takahe-manage runstator
+    stop_signal: SIGINT
 
   dev-nginx:
     <<: *dev-neodb-service
diff --git a/misc/bin/neodb-manage b/misc/bin/neodb-manage
index 86a946f2..6593643e 100755
--- a/misc/bin/neodb-manage
+++ b/misc/bin/neodb-manage
@@ -1,2 +1,2 @@
 #!/bin/sh
-cd /neodb && ${NEODB_VENV}/bin/python manage.py $@
+cd /neodb && exec ${NEODB_VENV}/bin/python manage.py $@
diff --git a/misc/bin/nginx-start b/misc/bin/nginx-start
index 9905ccb9..cfa5046a 100755
--- a/misc/bin/nginx-start
+++ b/misc/bin/nginx-start
@@ -1,4 +1,4 @@
 #!/bin/sh
 chown app:app /www/media /www/m
 envsubst '${NEODB_WEB_SERVER} ${NEODB_API_SERVER} ${TAKAHE_WEB_SERVER}' < $NGINX_CONF > /etc/nginx/conf.d/neodb.conf
-nginx -g 'daemon off;'
+exec nginx -g 'daemon off;'
diff --git a/misc/bin/takahe-manage b/misc/bin/takahe-manage
index 79dd4922..0d6e64d5 100755
--- a/misc/bin/takahe-manage
+++ b/misc/bin/takahe-manage
@@ -1,2 +1,2 @@
 #!/bin/sh
-cd /takahe && ${TAKAHE_VENV}/bin/python manage.py $@
+cd /takahe && exec ${TAKAHE_VENV}/bin/python manage.py $@