diff --git a/Makefile b/Makefile
index 914d79dc..a234794f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ sync:
 .PHONY: serve
 serve:
 	hugo server \
+	--baseURL $(URL) \
 	--buildDrafts \
 	--buildFuture \
 	--disableFastRender \
@@ -13,7 +14,7 @@ serve:
 
 .PHONY: production-build
 production-build: sync
-	hugo
+	hugo --baseURL $(URL)
 
 .PHONY: preview-build
 preview-build: sync
diff --git a/netlify.toml b/netlify.toml
index 4aadd3b1..831a73f6 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,12 +1,15 @@
 [build]
-publish = "public"
-command = "make production-build"
+  publish = "public"
+  command = "make production-build"
 
 [build.environment]
-HUGO_VERSION = "0.53"
+  HUGO_VERSION = "0.53"
+
+[dev]
+  command = "make serve URL=http://localhost:8888/"
 
 [context.deploy-preview]
-command = "make preview-build"
+  command = "make preview-build"
 
 [context.branch-deploy]
-command = "make preview-build"
+  command = "make preview-build"