diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile
index 239fe3db..bfcd056a 100644
--- a/images/nut-upsd/Dockerfile
+++ b/images/nut-upsd/Dockerfile
@@ -28,10 +28,10 @@ HEALTHCHECK CMD upsc $NAME@localhost:3493 2>&1|grep -q stale && \
 
 RUN apk add --no-cache dash && \
     apk add --update --no-cache nut=$NUT_VERSION \
-      busybox linux-pam \
+      busybox tini linux-pam \
       libcrypto3 libssl3 \
       libusb musl net-snmp-libs util-linux
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]
diff --git a/images/nut-upsd/Dockerfile.arm32 b/images/nut-upsd/Dockerfile.arm32
index 9c8863b2..0ca5a4be 100644
--- a/images/nut-upsd/Dockerfile.arm32
+++ b/images/nut-upsd/Dockerfile.arm32
@@ -28,7 +28,7 @@ RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' \
     echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
       >>/etc/apk/repositories && \
     apk add --update nut@testing=$NUT_VERSION \
-      libcrypto1.1@edge libssl1.1@edge net-snmp-libs@edge
+      libcrypto1.1@edge libssl1.1@edge net-snmp-libs@edge tini
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/
diff --git a/images/nut-upsd/Dockerfile.arm64 b/images/nut-upsd/Dockerfile.arm64
index 1a8847a3..2aeeffda 100644
--- a/images/nut-upsd/Dockerfile.arm64
+++ b/images/nut-upsd/Dockerfile.arm64
@@ -28,7 +28,7 @@ RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' \
     echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
       >>/etc/apk/repositories && \
     apk add --update nut@testing=$NUT_VERSION \
-      libcrypto1.1@edge libssl1.1@edge net-snmp-libs@edge
+      libcrypto1.1@edge libssl1.1@edge net-snmp-libs@edge tini
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/