diff --git a/Dockerfile.signal-cli b/Dockerfile.signal-cli
index 1145adb..b06f146 100644
--- a/Dockerfile.signal-cli
+++ b/Dockerfile.signal-cli
@@ -1,19 +1,9 @@
 FROM alpine:3.23
 
-ARG SIGNAL_CLI_VERSION=0.13.24
-
-RUN apk add --no-cache openjdk21-jre-headless bash su-exec && \
-    wget -O /tmp/signal-cli.tar.gz \
-        https://github.com/AsamK/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}.tar.gz && \
-    tar xzf /tmp/signal-cli.tar.gz -C /opt && \
-    rm /tmp/signal-cli.tar.gz && \
-    ln -sf /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli /usr/local/bin/signal-cli
-
-RUN adduser -D -u 1000 signal && \
+RUN apk add --no-cache signal-cli && \
+    adduser -D -u 1000 signal && \
     mkdir -p /home/signal/.signal-cli /home/.local/share/signal-cli && \
     chown -R signal:signal /home/signal /home/.local/share/signal-cli
 
-RUN printf '#!/bin/bash\nset -e\nmkdir -p /home/signal/.signal-cli\nchown signal:signal /home/signal/.signal-cli\nchmod 755 /home/signal/.signal-cli\nexec su-exec signal signal-cli --config /home/.local/share/signal-cli daemon --socket /home/signal/.signal-cli/socket\n' > /entrypoint.sh && \
-    chmod +x /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
+USER signal
+CMD ["signal-cli", "--config", "/home/.local/share/signal-cli", "daemon", "--socket", "/home/signal/.signal-cli/socket"]