diff --git a/elixir/1.12/Dockerfile b/elixir/1.12/Dockerfile
index 35cc661..2e7f0d9 100644
--- a/elixir/1.12/Dockerfile
+++ b/elixir/1.12/Dockerfile
@@ -10,6 +10,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"]
diff --git a/elixir/1.13/Dockerfile b/elixir/1.13/Dockerfile
index 79cc3dc..b7d78ed 100644
--- a/elixir/1.13/Dockerfile
+++ b/elixir/1.13/Dockerfile
@@ -10,6 +10,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"]
diff --git a/elixir/1.14/Dockerfile b/elixir/1.14/Dockerfile
index f5f08ca..eacdc1c 100644
--- a/elixir/1.14/Dockerfile
+++ b/elixir/1.14/Dockerfile
@@ -10,6 +10,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"]
diff --git a/elixir/1.15/Dockerfile b/elixir/1.15/Dockerfile
index 2449340..2903b15 100644
--- a/elixir/1.15/Dockerfile
+++ b/elixir/1.15/Dockerfile
@@ -10,6 +10,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"]
diff --git a/elixir/latest/Dockerfile b/elixir/latest/Dockerfile
index 1eeb9f5..ec60892 100644
--- a/elixir/latest/Dockerfile
+++ b/elixir/latest/Dockerfile
@@ -10,6 +10,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"]