diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee2a00a50..159f20c24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Changed `node main` to `exec node main` in the `entrypoint.sh` file to improve the container signal handling
 - Improved the language localization for Catalan (`ca`)
 - Improved the language localization for Español (`es`)
 - Improved the language localization for Turkish (`tr`)
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 71cf6f2dc..440886903 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -9,4 +9,4 @@ echo "Seeding the database"
 npx prisma db seed
 
 echo "Starting the server"
-node main
+exec node main