diff --git a/build/entrypoint.sh b/build/entrypoint.sh
index 4ccd6be3a2..9e9552b338 100755
--- a/build/entrypoint.sh
+++ b/build/entrypoint.sh
@@ -6,11 +6,24 @@ handle_term() {
     echo "received TERM signal"
     echo "stopping nginx-agent ..."
     kill -TERM "${agent_pid}" 2>/dev/null
+    wait -n ${agent_pid}
     echo "stopping nginx ..."
     kill -TERM "${nginx_pid}" 2>/dev/null
+    wait -n ${nginx_pid}
+}
+
+handle_quit() {
+    echo "received QUIT signal"
+    echo "stopping nginx-agent ..."
+    kill -QUIT "${agent_pid}" 2>/dev/null
+    wait -n ${agent_pid}
+    echo "stopping nginx ..."
+    kill -QUIT "${nginx_pid}" 2>/dev/null
+    wait -n ${nginx_pid}
 }
 
 trap 'handle_term' TERM
+trap 'handle_quit' QUIT
 
 rm -rf /var/run/nginx/*.sock