diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index 1e54dec3..c73bbd85 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -23,7 +23,7 @@ RUN set -euxo pipefail \
 RUN echo $VERSION >/version
 
 #EXPOSE 8080/tcp
-HEALTHCHECK CMD curl -skfLo /dev/null http://localhost:8080/ping
+HEALTHCHECK CMD curl -m3 -skfLo /dev/null http://localhost:8080/ping
 
 VOLUME ["/data","/dkim"]
 
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index cacb6c99..41992f30 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -29,7 +29,7 @@ RUN echo $VERSION >/version
 
 EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 4190/tcp
 # EXPOSE 10025/tcp 10143/tcp 14190/tcp
-HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://127.0.0.1:10204/health && kill -0 `cat /run/dovecot/master.pid`
+HEALTHCHECK --start-period=60s CMD curl -m3 -skfLo /dev/null http://127.0.0.1:10204/health && kill -0 `cat /run/dovecot/master.pid`
 
 VOLUME ["/certs", "/overrides"]
 
diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile
index 9f61f7d0..16f4a610 100644
--- a/core/rspamd/Dockerfile
+++ b/core/rspamd/Dockerfile
@@ -17,7 +17,7 @@ COPY start.py /
 RUN echo $VERSION >/version
 
 #EXPOSE 11332/tcp 11334/tcp 11335/tcp
-HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost:11334/
+HEALTHCHECK --start-period=350s CMD curl -m3 -skfLo /dev/null http://localhost:11334/
 
 VOLUME ["/var/lib/rspamd"]
 
diff --git a/setup/Dockerfile b/setup/Dockerfile
index a410871d..4ddfe683 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -15,7 +15,7 @@ COPY main.py ./main.py
 RUN echo $VERSION >> /version
 
 EXPOSE 80/tcp
-HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost/
+HEALTHCHECK --start-period=350s CMD curl -m3 -skfLo /dev/null http://localhost/
 USER mailu
 
 CMD gunicorn -w 4 -b :80 --access-logfile - --error-logfile - --preload main:app
diff --git a/towncrier/newsfragments/3398.misc b/towncrier/newsfragments/3398.misc
index e786a1ef..895b6f1d 100644
--- a/towncrier/newsfragments/3398.misc
+++ b/towncrier/newsfragments/3398.misc
@@ -1 +1,2 @@
 Disable HARDENED_MALLOC unless the requirements are met
+Ensure the healthchecks timeout
diff --git a/webmails/Dockerfile b/webmails/Dockerfile
index 517cb873..712c5dfd 100644
--- a/webmails/Dockerfile
+++ b/webmails/Dockerfile
@@ -94,6 +94,6 @@ VOLUME /overrides
 
 CMD /start.py
 
-HEALTHCHECK CMD curl -f -L http://localhost/ping || exit 1
+HEALTHCHECK CMD curl -m3 -f -L http://localhost/ping || exit 1
 
 RUN echo $VERSION >> /version