diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 76c3906a..ae6f40d2 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -28,7 +28,7 @@ RUN echo $VERSION >/version
 
 EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp
 # EXPOSE 10025/tcp 10143/tcp 14190/tcp
-HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://localhost/health
+HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://127.0.0.1:10204/health
 
 VOLUME ["/certs", "/overrides"]
 
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 9afa0af9..41203b1b 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -291,6 +291,14 @@ http {
       }
     }
 
+    # Healthcheck over localhost, for docker
+    server {
+      listen 127.0.0.1:10204;
+      location /health {
+        return 204;
+      }
+    }
+
     include /etc/nginx/conf.d/*.conf;
 }