diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index ada8ef014..6a8746849 100644
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -10,7 +10,7 @@ fi
 DB_PATH="${HOME}/.dstack/server/data/sqlite.db"
 mkdir -p "$(dirname "$DB_PATH")"
 if [[ -z "${LITESTREAM_REPLICA_URL}" ]]; then
-  dstack server --host 0.0.0.0
+  exec dstack server --host 0.0.0.0
 else
   if [[ ! -f "$DB_PATH" ]]; then
     echo "Attempting Litestream restore..."
@@ -23,5 +23,5 @@ else
       fi
     fi
   fi
-  litestream replicate -exec "dstack server --host 0.0.0.0" "$DB_PATH" "$LITESTREAM_REPLICA_URL"
+  exec litestream replicate -exec "dstack server --host 0.0.0.0" "$DB_PATH" "$LITESTREAM_REPLICA_URL"
 fi
diff --git a/docker/server/release/Dockerfile b/docker/server/release/Dockerfile
index 8bd739b88..ca94a26f2 100644
--- a/docker/server/release/Dockerfile
+++ b/docker/server/release/Dockerfile
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     git \
     sqlite3 \
+    tini \
     && rm -rf /var/lib/apt/lists/*
 
 RUN if [ $(uname -m) = "aarch64" ]; then ARCH="arm64"; else ARCH="x86_64"; fi && \
@@ -19,7 +20,7 @@ RUN if [ $(uname -m) = "aarch64" ]; then ARCH="arm64"; else ARCH="x86_64"; fi &&
 
 ADD https://astral.sh/uv/install.sh /uv-installer.sh
 RUN sh /uv-installer.sh && rm /uv-installer.sh
-ENV PATH="/root/.local/bin/:$PATH" 
+ENV PATH="/root/.local/bin/:$PATH"
 
 RUN uv tool install "dstack[all]==$VERSION"
 
@@ -28,4 +29,4 @@ RUN chmod 777 entrypoint.sh
 
 EXPOSE 3000
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "./entrypoint.sh"]
diff --git a/docker/server/stgn/Dockerfile b/docker/server/stgn/Dockerfile
index c6138bd8f..079eb7be4 100644
--- a/docker/server/stgn/Dockerfile
+++ b/docker/server/stgn/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     git \
     sqlite3 \
+    tini \
     && rm -rf /var/lib/apt/lists/*
 
 RUN if [ $(uname -m) = "aarch64" ]; then ARCH="arm64"; else ARCH="x86_64"; fi && \
@@ -28,4 +29,4 @@ RUN chmod 777 entrypoint.sh
 
 EXPOSE 3000
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "./entrypoint.sh"]