diff --git a/Dockerfile b/Dockerfile
index 7d109d5..3814eb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,6 @@ RUN apt-get update \
         openssl \
         ca-certificates \
         ssl-cert \
-        tini \
     && rm -rf /var/lib/apt/lists/*
 
 # Install and configure prosody
diff --git a/entrypoint.sh b/entrypoint.sh
index 8be3dd0..63ae7c6 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,7 +10,7 @@ if [[ "$(stat -c %u /var/run/prosody/)" != "$data_dir_owner" ]]; then
 fi
 
 if [[ "$1" != "prosody" ]]; then
-    exec tini -- prosodyctl "$@"
+    exec prosodyctl "$@"
     exit 0;
 fi
 
@@ -18,4 +18,4 @@ if [[ "$LOCAL" && "$PASSWORD" && "$DOMAIN" ]]; then
     prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD"
 fi
 
-exec tini -- runuser -u prosody -- "$@"
+exec runuser -u prosody -- "$@"