diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile
index 1a2c09d..075d12e 100644
--- a/postgres/10/Dockerfile
+++ b/postgres/10/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata
+
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/postgres/11/Dockerfile b/postgres/11/Dockerfile
index 4ed6f38..992062e 100644
--- a/postgres/11/Dockerfile
+++ b/postgres/11/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata
+
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/postgres/12/Dockerfile b/postgres/12/Dockerfile
index e21d236..6dc5db1 100644
--- a/postgres/12/Dockerfile
+++ b/postgres/12/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata
+
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/postgres/13/Dockerfile b/postgres/13/Dockerfile
index ed1d229..d86c033 100644
--- a/postgres/13/Dockerfile
+++ b/postgres/13/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata
+
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/postgres/14/Dockerfile b/postgres/14/Dockerfile
index c41ec76..4c8b019 100644
--- a/postgres/14/Dockerfile
+++ b/postgres/14/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata fontconfig git openssl sqlite tar tzdata
+
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/postgres/9/Dockerfile b/postgres/9/Dockerfile
index fc94f1c..d1b5840 100644
--- a/postgres/9/Dockerfile
+++ b/postgres/9/Dockerfile
@@ -8,9 +8,14 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
 # UID 999 is the default pterodactyl user
 RUN adduser -D -h /home/container container
 
+RUN     apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata
 USER container
 ENV HOME /home/container
 WORKDIR /home/container
 
-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    ["/sbin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
\ No newline at end of file