diff --git a/.gitignore b/.gitignore
index 7e47ccfb..024b97af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ test_results/
 
 # API docs for local preview only.
 _site/
+_serve/
diff --git a/Makefile b/Makefile
index 769580d5..500c1f8c 100644
--- a/Makefile
+++ b/Makefile
@@ -170,8 +170,11 @@ check-licenses:
 
 .PHONY: serve-docs
 serve-docs:
-	@echo 'to browse: open http://127.0.0.1:8000/documentation/'
-	@python3 -m http.server --bind 127.0.0.1 --directory ./_site
+	@echo 'to browse: open http://127.0.0.1:8000/container/documentation/'
+	@rm -rf _serve
+	@mkdir -p _serve
+	@cp -a _site _serve/container
+	@python3 -m http.server --bind 127.0.0.1 --directory ./_serve
 
 .PHONY: docs
 docs: _site
@@ -179,7 +182,7 @@ docs: _site
 _site:
 	@echo Updating API documentation...
 	rm -rf $@
-	@scripts/make-docs.sh $@
+	@scripts/make-docs.sh $@ container
 
 .PHONY: cleancontent
 cleancontent:
@@ -191,4 +194,5 @@ cleancontent:
 clean:
 	@echo Cleaning the build files...
 	@rm -rf bin/ libexec/
+	@rm -rf _site _serve
 	@$(SWIFT) package clean