diff --git a/changes/changelog.d/improve-signal-handling.bugfix b/changes/changelog.d/improve-signal-handling.bugfix
new file mode 100644
index 000000000..733fed50d
--- /dev/null
+++ b/changes/changelog.d/improve-signal-handling.bugfix
@@ -0,0 +1 @@
+Improve signal handling for service and containers
diff --git a/deploy/funkwhale-server.service b/deploy/funkwhale-server.service
index 688f9c2a8..0a0503d51 100644
--- a/deploy/funkwhale-server.service
+++ b/deploy/funkwhale-server.service
@@ -9,11 +9,14 @@ User=funkwhale
 WorkingDirectory=/srv/funkwhale/api
 EnvironmentFile=/srv/funkwhale/config/.env
 
+Type=notify
+KillMode=mixed
 ExecStart=/srv/funkwhale/venv/bin/gunicorn \
     config.asgi:application \
     --workers ${FUNKWHALE_WEB_WORKERS} \
     --worker-class uvicorn.workers.UvicornWorker \
     --bind ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}
+ExecReload=/bin/kill -s HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target