diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 204788a637..a19f5749a0 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -71,7 +71,7 @@ RUN mkdir -p ${APP_DIR} ${DATA_DIR} \
     \
     # Install curl for health check
     && apt-get -yqq update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends curl \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends curl tini \
     && rm -rf /var/lib/apt/lists/*
 
 USER ${UID}
@@ -80,6 +80,8 @@ WORKDIR ${APP_DIR}
 COPY --from=jre-build --chown=${UID}:0 /opt/java/openjdk $JAVA_HOME
 COPY --chown=${UID}:0 ./target/${WAR_FILENAME} ./src/main/docker/logback-json.xml ./
 
+ENTRYPOINT ["/usr/bin/tini", "--"]
+
 # Launch Dependency-Track
 CMD [ \
     "/bin/sh", "-c", \
@@ -97,7 +99,7 @@ CMD [ \
 EXPOSE 8080
 
 # Add a healthcheck using the Dependency-Track version API
-HEALTHCHECK --interval=30s --start-period=60s --timeout=3s CMD [ \
+HEALTHCHECK --interval=30s --start-period=60s --timeout=5s CMD [ \
     "/bin/sh", "-c", \
     "curl -f -s --max-time 3 --noproxy '*' -o /dev/null http://127.0.0.1:8080${CONTEXT}health" \
 ]
diff --git a/src/main/docker/Dockerfile.alpine b/src/main/docker/Dockerfile.alpine
index 1b625258fd..cf9e14e863 100644
--- a/src/main/docker/Dockerfile.alpine
+++ b/src/main/docker/Dockerfile.alpine
@@ -77,7 +77,7 @@ RUN mkdir -p ${APP_DIR} ${DATA_DIR} \
     && adduser -S -D -G dtrack -H -h ${DATA_DIR} -g "dtrack user" -s /bin/false -u ${UID} dtrack \
     && chown -R dtrack:0 ${DATA_DIR} ${APP_DIR} \
     && chmod -R g=u ${DATA_DIR} ${APP_DIR} \
-    && apk add --no-cache tzdata curl
+    && apk add --no-cache curl tini tzdata
 
 USER ${UID}
 WORKDIR ${APP_DIR}
@@ -85,6 +85,8 @@ WORKDIR ${APP_DIR}
 COPY --from=jre-build --chown=${UID}:0 /work/jre ${JAVA_HOME}
 COPY --chown=${UID}:0 ./target/${WAR_FILENAME} ./src/main/docker/logback-json.xml ./
 
+ENTRYPOINT ["/sbin/tini", "--"]
+
 # Launch Dependency-Track
 CMD [ \
     "/bin/sh", "-c", \
@@ -102,7 +104,7 @@ CMD [ \
 EXPOSE 8080
 
 # Add a healthcheck using the Dependency-Track version API
-HEALTHCHECK --interval=30s --start-period=60s --timeout=3s CMD [ \
+HEALTHCHECK --interval=30s --start-period=60s --timeout=5s CMD [ \
     "/bin/sh", "-c", \
     "curl -f -s --max-time 3 --noproxy '*' -o /dev/null http://127.0.0.1:8080${CONTEXT}health" \
 ]