diff --git a/Makefile b/Makefile
index dfd8cab1c6..3df7455201 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ PROMU             ?= $(GOBIN)/promu-$(PROMU_VERSION)
 PROMU_VERSION     ?= 264dc36af9ea3103255063497636bd5713e3e9c1
 PROTOC            ?= $(GOBIN)/protoc-$(PROTOC_VERSION)
 PROTOC_VERSION    ?= 3.4.0
-# v0.55.3
+# v0.55.3 This needs to match with version in netlify.toml
 HUGO_VERSION      ?= 993b84333cd75faa224d02618f312a0e96b53372
 HUGO              ?= $(GOBIN)/hugo-$(HUGO_VERSION)
 # v3.1.1
diff --git a/netlify.toml b/netlify.toml
index 81e5c1b333..f5c7576308 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -10,8 +10,10 @@ publish = "website/public"
 # via simple curl.
 environment = { HUGO_VERSION="0.55.3" }
 
-[context.production]
-command = "make web HUGO=$(which hugo)"
+# NOTE: Sleep at then is to make sure logs are not truncated on error.
+command = "(env && make web HUGO=$(which hugo)) || (sleep 30; false)"
 
 [context.deploy-preview]
-command = "make web HUGO=$(which hugo) WEBSITE_BASE_URL=${DEPLOY_PRIME_URL}"
\ No newline at end of file
+
+# NOTE: Sleep at then is to make sure logs are not truncated on error.
+command = "(env && make web HUGO=$(which hugo) WEBSITE_BASE_URL=${DEPLOY_PRIME_URL}) || (sleep 30; false)"
\ No newline at end of file