diff --git a/Makefile b/Makefile
index 0c1f50157a..924fb690f0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,12 @@ docs-generate:
         $(MAKE) --no-print-directory -C $$mod docs-generate; \
     done
 
+.PHONY: config-docs-generate
+config-docs-generate:
+	@for mod in $(OCIS_MODULES); do \
+        $(MAKE) --no-print-directory -C $$mod config-docs-generate; \
+    done
+
 .PHONY: ci-go-generate
 ci-go-generate:
 	@for mod in $(OCIS_MODULES); do \
diff --git a/docs/Makefile b/docs/Makefile
index 3f2d736cb2..f8115b11c7 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,9 +5,13 @@ help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: docs-generate
-docs-generate: ## run config-docs-generate for all oCIS extensions
+docs-generate: ## run docs-generate for all oCIS extensions
 	@$(MAKE) --no-print-directory -C ../ docs-generate
-	
+
+.PHONY: config-docs-generate
+config-docs-generate: ## run config-docs-generate for all oCIS extensions
+	@$(MAKE) --no-print-directory -C ../ config-docs-generate
+
 .PHONY: docs-copy
 docs-copy: ## copy docs to hugo
 	@mkdir -p hugo/content/
@@ -21,14 +25,13 @@ docs-copy: ## copy docs to hugo
 	rsync -ax --delete --exclude hugo/ --exclude Makefile --exclude .gitignore --exclude README.md ../. content/; \
 
 .PHONY: docs-serve
-docs-serve: docs-generate docs-copy ## serve docs with hugo
+docs-serve: docs-generate docs-copy ## serve docs with hugo in docker
 	@docker run --rm --network host -v $(shell pwd)/hugo:/src owncloudci/hugo:0 server
 
-.PHONY: docs-serve-native
-docs-serve-native: docs-copy
+.PHONY: docs-serve-simple
+docs-serve-simple: config-docs-generate docs-copy ## serve docs with hugo installed on system
 	cd hugo && hugo server
 
-
 .PHONY: clean
 clean: ## clean up docs build artifacts
 	@rm -rf hugo