diff --git a/rdp-proxy/Dockerfile b/rdp-proxy/Dockerfile
index 4616c17..a7da39d 100644
--- a/rdp-proxy/Dockerfile
+++ b/rdp-proxy/Dockerfile
@@ -2,11 +2,22 @@ FROM debian:bookworm-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y --no-install-recommends     python3     xvfb     x11vnc     freerdp2-x11     novnc     websockify     xdotool     ca-certificates     fonts-dejavu-core     && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    tini \
+    python3 \
+    xvfb \
+    x11vnc \
+    freerdp2-x11 \
+    novnc \
+    websockify \
+    xdotool \
+    ca-certificates \
+    fonts-dejavu-core \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY entrypoint.sh /entrypoint.sh
 COPY manager.py /manager.py
 RUN chmod +x /entrypoint.sh
 
 EXPOSE 6080 7001
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/entrypoint.sh"]
diff --git a/universal-runtime/Dockerfile b/universal-runtime/Dockerfile
index 692025a..89087d2 100644
--- a/universal-runtime/Dockerfile
+++ b/universal-runtime/Dockerfile
@@ -3,6 +3,7 @@ FROM debian:bookworm-slim
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    tini \
     chromium \
     xvfb \
     x11vnc \
@@ -23,4 +24,4 @@ COPY manager.py /manager.py
 RUN chmod +x /entrypoint.sh
 
 EXPOSE 6080
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/entrypoint.sh"]