diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index ed05731d..da29756f 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -14,4 +14,4 @@ VOLUME ["/data", "/mail"]
 
 CMD /start.py
 
-HEALTHCHECK CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
+HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 87951c03..00ecf84e 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -13,4 +13,4 @@ VOLUME ["/certs"]
 
 CMD /start.py
 
-HEALTHCHECK CMD curl -f -L http://localhost/ || exit 1
+HEALTHCHECK CMD curl -k -f -L http://localhost/health || exit 1
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 1dcd5e88..17d67526 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -150,6 +150,10 @@ http {
         proxy_pass_request_body off;
         proxy_set_header Content-Length "";
       }
+
+      location /health {
+        return 204;
+      }
     }
     {% endif %}
 
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index 5533499e..e0529e01 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -13,4 +13,4 @@ VOLUME ["/data"]
 
 CMD /start.py
 
-HEALTHCHECK CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
+HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile
index 9b8f68e2..76731c9a 100644
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -15,4 +15,4 @@ VOLUME ["/var/lib/rspamd"]
 
 CMD /start.py
 
-HEALTHCHECK CMD curl -f -L http://localhost:11334/ || exit 1
+HEALTHCHECK --start-period=350s CMD curl -f -L http://localhost:11334/ || exit 1