diff --git a/Dockerfile b/Dockerfile
index c2da8eb..31faed0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,4 +55,4 @@ COPY rootfs /
 EXPOSE 2500
 
 HEALTHCHECK --interval=10s --timeout=5s \
-  CMD printf 'EHLO localhost\r\nQUIT\r\n' | nc -w 2 127.0.0.1 "$LISTEN_PORT" | grep -q '^250' || exit 1
+  CMD netstat -ltn | grep -q ":${LISTEN_PORT}[[:space:]].*LISTEN" || exit 1
diff --git a/rootfs/etc/cont-init.d/03-create-service.sh b/rootfs/etc/cont-init.d/03-create-service.sh
index aadb26e..12ea3bd 100644
--- a/rootfs/etc/cont-init.d/03-create-service.sh
+++ b/rootfs/etc/cont-init.d/03-create-service.sh
@@ -6,6 +6,6 @@ cat > /etc/services.d/msmtpd/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 s6-setuidgid ${PUID}:${PGID}
-msmtpd --interface=0.0.0.0 --port=${LISTEN_PORT} --command="/usr/bin/msmtp -f %F"
+msmtpd --interface=0.0.0.0 --port=${LISTEN_PORT} --log=/proc/self/fd/2 --command="/usr/bin/msmtp -f %F"
 EOL
 chmod +x /etc/services.d/msmtpd/run