diff --git a/netlify.toml b/netlify.toml
index bb8dcd390..7ecd9ebc4 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,18 +1,23 @@
 [build]
-  publish = "public"
-  command = "hugo"
+publish = "public"
+command = "hugo"
 
 [context.production.environment]
-  HUGO_VERSION = "0.36"
-  HUGO_ENV = "production"
-  HUGO_ENABLEGITINFO = "true"
+HUGO_VERSION = "0.36"
+HUGO_ENV = "production"
+HUGO_ENABLEGITINFO = "true"
+
+[context.deploy-preview]
+command = "hugo -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-  HUGO_VERSION = "0.36"
+HUGO_VERSION = "0.36"
+
+[context.branch-deploy]
+command = "hugo -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-  HUGO_VERSION = "0.36"
+HUGO_VERSION = "0.36"
 
 [context.next.environment]
-  HUGO_BASEURL = "https://next--gohugoio.netlify.com/"
-  HUGO_ENABLEGITINFO = "true"
\ No newline at end of file
+HUGO_ENABLEGITINFO = "true"