diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e3417c..e9b85d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ pages:
   - make
   - make build-manual
   - mkdir -p public
-  - cp -ar tmp/en-US/html/* public
-  - cp -ar tmp/en-US/html/master.html public/index.html
+  - cp -ar html/* public
+  - cp -ar html/master.html public/index.html
   tags:
   - shared
   only:
diff --git a/Makefile b/Makefile
index 6e66bb2..d34fe97 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ build-snippets:
 	  src/*.c src/*.cpp src/*.java src/*.py src/*.go src/*.sh
 
 build-manual: build-snippets
-	cd en-US && asciidoctor -n master.adoc
+	rm -rf html && mkdir html
+	cd en-US && asciidoctor -n master.adoc -D ../html && cp -ar Common_Content/ ../html/
 
-build-manual-html: build-snippets
-	cd en-US && asciidoctor -n master.adoc
+build-manual-html: build-manual
 
 build-manual-epub: build-snippets
 	false
@@ -25,6 +25,6 @@ build-manual-pdf: build-snippets
 	false
 
 clean: clean-src
-	-rm -rf tmp
+	-rm -rf html
 	-rm -rf en-US/*/snippets