diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index d2260c98..97aa26ce 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -16,7 +16,7 @@ COPY start.py /
 RUN echo $VERSION >/version
 
 EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-HEALTHCHECK CMD echo PING|nc -w2 localhost 5001|grep "PONG"
+HEALTHCHECK CMD kill -0 `cat /run/dovecot/master.pid`
 
 VOLUME ["/mail"]
 
diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index ebcd97aa..11138694 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -95,13 +95,6 @@ service auth-worker {
   }
 }
 
-service health-check {
-  executable = script -p health-check.sh
-  inet_listener health-check {
-      port = 5001
-  }
-}
-
 ###############
 # IMAP & POP
 ###############
diff --git a/core/dovecot/start.py b/core/dovecot/start.py
index afc0d6f6..a8ac474c 100755
--- a/core/dovecot/start.py
+++ b/core/dovecot/start.py
@@ -9,7 +9,7 @@ import sys
 from podop import run_server
 from socrate import system, conf
 
-system.set_env(log_filters=r'waitpid\(\) returned unknown PID \d+$')
+system.set_env()
 
 def start_podop():
     system.drop_privs_to('mail')
diff --git a/towncrier/newsfragments/2793.bugfix b/towncrier/newsfragments/2793.bugfix
index d57c9bb9..591e33e8 100644
--- a/towncrier/newsfragments/2793.bugfix
+++ b/towncrier/newsfragments/2793.bugfix
@@ -1 +1,2 @@
 The SMTP container wasn't logging things like it should
+The health-check of dovecot was creating zombies