diff --git a/build/Dockerfile b/build/Dockerfile
index 6560e56c18..7988d160b9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -31,7 +31,7 @@ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins \
 USER mattermost
 
 #Healthcheck to make sure container is ready
-HEALTHCHECK --interval=5m --timeout=3s \
+HEALTHCHECK --interval=30s --timeout=10s \
   CMD curl -f http://localhost:8065/api/v4/system/ping || exit 1