diff --git a/Dockerfile b/Dockerfile
index 3258678..ca734dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN dpkg --add-architecture i386
 RUN set -x \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends --no-install-suggests \
-	xvfb mesa-utils libx32gcc-s1 lib32gcc-s1 build-essential libxi6 x11-utils \
+	xvfb mesa-utils libx32gcc-s1 lib32gcc-s1 build-essential libxi6 x11-utils tini \
 	&& mkdir -p "${STEAMAPPDIR}" \
 	&& mkdir -p "${STEAMAPPDATADIR}" \
 	&& chmod +x "${HOMEDIR}/entry.sh" \
@@ -55,4 +55,7 @@ WORKDIR ${HOMEDIR}
 
 VOLUME ${STEAMAPPDIR}
 
+# Use tini as the entrypoint for signal handling
+ENTRYPOINT ["/usr/bin/tini", "--"]
+
 CMD ["bash", "entry.sh"]