diff --git a/Makefile b/Makefile
index 4edbce07..c6d4d63d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?= -n -j "auto" -w "build.log"
+SPHINXOPTS    ?= -n -j auto -w "build.log"
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = source
 BUILDDIR      = build
@@ -15,18 +15,15 @@ help:
 
 .PHONY: help Makefile
 
-all: linux windows macos container kubernetes
-
 # dry-run build command to double check output build dirs
 dryrun:
 	@echo "$(SPHINXBUILD) -M $@ '$(SOURCEDIR)' '$(BUILDDIR)/$(GITDIR)' $(SPHINXOPTS) $(O)"
 
-clean-all:
+clean:
 	@echo "Cleaning $(BUILDDIR)/$(GITDIR)"
 	@rm -rf $(BUILDDIR)/$(GITDIR)
 
 clean-%:
-
 	@echo "Cleaning $(BUILDDIR)/$(GITDIR)/$*"
 	@rm -rf $(BUILDDIR)/$(GITDIR)/$*
 
@@ -328,4 +325,4 @@ sync-deps:
 	@echo -e "Specify one of the following supported build outputs"
 	@echo -e "- make linux\n- make macos\n- make windows\n- make k8s\n- make container"
 	@echo -e "Clean targets with 'make clean-<target>'"
-	@echo -e "Clean all targets with `make clean-all`"
+	@echo -e "Clean all targets with `make clean`"
diff --git a/build-docs.sh b/build-docs.sh
index 920efc34..5a38d2a2 100755
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ex
+
 branch=$(git branch --show-current)
 export NVM_DIR="/home/minio/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
@@ -7,11 +9,8 @@ nvm use stable
 
 export PATH=${PATH}:${HOME}/.local/bin
 
-make clean-all
-make all
-
-sudo mkdir -p /var/www/docs/minio/windows
-sudo mkdir -p /var/www/docs/minio/macos
+make clean
+make linux windows macos container k8s
 
 sudo rm -rf /var/www/docs/minio/kubernetes/upstream
 sudo mkdir -p /var/www/docs/minio/kubernetes/upstream
@@ -29,7 +28,6 @@ sudo rm -rf /var/www/docs/minio/macos
 sudo mkdir -p /var/www/docs/minio/macos
 sudo cp -vr build/${branch}/macos/html/* /var/www/docs/minio/macos/
 
-
 sudo rm -rf /var/www/docs/minio/windows
 sudo mkdir -p /var/www/docs/minio/windows
 sudo cp -vr build/${branch}/windows/html/* /var/www/docs/minio/windows/