diff --git a/build/fpm/entrypoint/entrypoint_development.sh b/build/fpm/entrypoint/entrypoint_development.sh
index e264b0c201e492367174a52a3618dc49564f0570..422b280ce954b486fd71202556c7a935e2b98b98 100755
--- a/build/fpm/entrypoint/entrypoint_development.sh
+++ b/build/fpm/entrypoint/entrypoint_development.sh
@@ -1,7 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
+_trap() {
+  echo "Stopping FPM"
+  kill -s SIGQUIT $FPM_PID
+}
+
+trap _trap SIGQUIT
+
 validate_laravel
 
 if [ ! -f .env ];
@@ -22,4 +29,6 @@ php artisan db:seed
 php artisan ide-helper:generate
 php artisan ide-helper:meta
 
-docker-php-entrypoint php-fpm
\ No newline at end of file
+docker-php-entrypoint php-fpm &
+FPM_PID=$!
+wait
\ No newline at end of file
diff --git a/build/fpm/entrypoint/entrypoint_production.sh b/build/fpm/entrypoint/entrypoint_production.sh
index 01668bfac4512df517aa5a2c41bca52a38e7bf8b..357512fa2059b783257a6bfaecb71af8484ea8e5 100755
--- a/build/fpm/entrypoint/entrypoint_production.sh
+++ b/build/fpm/entrypoint/entrypoint_production.sh
@@ -1,7 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
+_trap() {
+  echo "Stopping FPM"
+  kill -s SIGQUIT $FPM_PID
+}
+
+trap _trap SIGQUIT
+
 validate_laravel
 
 # Production version will have the .env file mounted at /home/metager/.env
@@ -19,4 +26,6 @@ php artisan route:trans:cache
 php artisan spam:load
 php artisan load:affiliate-blacklist
 
-docker-php-entrypoint php-fpm
\ No newline at end of file
+docker-php-entrypoint php-fpm &
+FPM_PID=$!
+wait
\ No newline at end of file