diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05d52723..1fd1a5e0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -80,4 +80,6 @@ RUN chmod +x /usr/local/bin/sidekiq-entrypoint.sh
 
 EXPOSE $RAILS_PORT
 
+STOPSIGNAL SIGINT
+
 ENTRYPOINT [ "bundle", "exec" ]
diff --git a/docker/sidekiq-entrypoint.sh b/docker/sidekiq-entrypoint.sh
index b55f3ff0..d137874a 100644
--- a/docker/sidekiq-entrypoint.sh
+++ b/docker/sidekiq-entrypoint.sh
@@ -33,4 +33,4 @@ done
 echo "✅ PostgreSQL is ready!"
 
 # run sidekiq
-bundle exec sidekiq
+exec bundle exec sidekiq
diff --git a/docker/web-entrypoint.sh b/docker/web-entrypoint.sh
index 5d1f7143..56a0df5d 100644
--- a/docker/web-entrypoint.sh
+++ b/docker/web-entrypoint.sh
@@ -83,4 +83,4 @@ echo "Running seeds..."
 bundle exec rails db:seed
 
 # run passed commands
-bundle exec ${@}
+exec bundle exec ${@}