diff --git a/Makefile b/Makefile
index 2873286..d52985b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,26 +13,27 @@
 # the Doc Template for RISC-V Extensions.
 
 DOCS := \
-	spec-sample.adoc fusa-whitepaper.adoc
+	fusa-whitepaper.adoc
 
 DATE ?= $(shell date +%Y-%m-%d)
 VERSION ?= v0.0.0
 REVMARK ?= Draft
 DOCKER_IMG := riscvintl/riscv-docs-base-container-image:latest
 ifneq ($(SKIP_DOCKER),true)
-	DOCKER_IS_PODMAN = \
-		$(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?)
-	ifeq "$(DOCKER_IS_PODMAN)" "1"
-		DOCKER_VOL_SUFFIX = :z
-	endif
-
-	DOCKER_CMD := \
-		docker run --rm \
-			-v ${PWD}:/build${DOCKER_VOL_SUFFIX} \
-			-w /build \
-			${DOCKER_IMG} \
-			/bin/sh -c
-	DOCKER_QUOTE := "
+  DOCKER_IS_PODMAN = \
+    $(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?)
+  ifeq "$(DOCKER_IS_PODMAN)" "1"
+    DOCKER_VOL_SUFFIX = :z
+  endif
+
+  DOCKER_CMD := \
+    docker run --rm \
+      -u `id -u`:`id -g` \
+      -v ${PWD}:/build${DOCKER_VOL_SUFFIX} \
+      -w /build \
+      ${DOCKER_IMG} \
+      /bin/sh -c
+  DOCKER_QUOTE := "
 endif
 
 SRC_DIR := src
@@ -45,20 +46,29 @@ XTRA_ADOC_OPTS :=
 ASCIIDOCTOR_PDF := asciidoctor-pdf
 ASCIIDOCTOR_HTML := asciidoctor
 OPTIONS := --trace \
-           -a compress \
-           -a mathematical-format=svg \
-           -a revnumber=${VERSION} \
-           -a revremark=${REVMARK} \
-           -a revdate=${DATE} \
-           -a pdf-fontsdir=docs-resources/fonts \
-           -a pdf-theme=docs-resources/themes/riscv-pdf.yml \
-           $(XTRA_ADOC_OPTS) \
-		   -D build \
-           --failure-level=ERROR
+  -a compress \
+  -a mathematical-format=svg \
+  -a revnumber=${VERSION} \
+  -a revremark=${REVMARK} \
+  -a revdate=${DATE} \
+  -a imagesoutdir=${BUILD_DIR}/images \
+  -a pdf-fontsdir=docs-resources/fonts \
+  -a pdf-theme=docs-resources/themes/riscv-pdf.yml \
+  $(XTRA_ADOC_OPTS) \
+  -D ${BUILD_DIR}/adoc \
+  --failure-level=ERROR
 REQUIRES := --require=asciidoctor-bibtex \
-            --require=asciidoctor-diagram \
-			--require=asciidoctor-lists \
-            --require=asciidoctor-mathematical
+  -a compress \
+  -a mathematical-format=svg \
+  -a revnumber=${VERSION} \
+  -a revremark=${REVMARK} \
+  -a revdate=${DATE} \
+  -a imagesoutdir=${BUILD_DIR}/images \
+  -a pdf-fontsdir=docs-resources/fonts \
+  -a pdf-theme=docs-resources/themes/riscv-pdf.yml \
+  $(XTRA_ADOC_OPTS) \
+  -D ${BUILD_DIR}/adoc \
+  --failure-level=ERROR
 
 .PHONY: all build clean build-container build-no-container build-docs
 
@@ -83,6 +93,7 @@ build:
 		echo "Docker is not available, building without Docker..."; \
 		$(MAKE) build-no-container; \
 	fi
+	@echo "Generated documents can be found in the 'build/adoc' folder."
 
 build-container:
 	@echo "Starting build inside Docker container..."
diff --git a/src/fusa-whitepaper.adoc b/src/fusa-whitepaper.adoc
index b843d67..ce80d40 100644
--- a/src/fusa-whitepaper.adoc
+++ b/src/fusa-whitepaper.adoc
@@ -17,6 +17,7 @@ include::../docs-resources/global-config.adoc[]
 :experimental:
 :reproducible:
 //:WaveDromEditorApp: app/wavedrom-editor.app
+// imagesoutdir is overrided in Makefile
 :imagesoutdir: images
 //:srcdir: src
 :bibtex-file: src/fusa-whitepaper.bib