diff --git a/bun/canary/Dockerfile b/bun/canary/Dockerfile
index 5078d5d..551d9d0 100644
--- a/bun/canary/Dockerfile
+++ b/bun/canary/Dockerfile
@@ -12,6 +12,9 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-ENTRYPOINT []
-COPY        ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+STOPSIGNAL SIGINT
+
+COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/bun/latest/Dockerfile b/bun/latest/Dockerfile
index 57cd00e..c5f7010 100644
--- a/bun/latest/Dockerfile
+++ b/bun/latest/Dockerfile
@@ -12,6 +12,9 @@ USER container
 ENV USER=container HOME=/home/container
 WORKDIR /home/container
 
-ENTRYPOINT []
-COPY        ./../entrypoint.sh /entrypoint.sh
-CMD          [ "/bin/bash", "/entrypoint.sh" ]
+STOPSIGNAL SIGINT
+
+COPY        --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]