diff --git a/build-docs.sh b/build-docs.sh
index 5a38d2a2..35ba923a 100755
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -3,7 +3,7 @@
 set -ex
 
 branch=$(git branch --show-current)
-export NVM_DIR="/home/minio/.nvm"
+export NVM_DIR="${HOME}/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
 nvm use stable
 
diff --git a/source/_templates/content-navigation.html b/source/_templates/content-navigation.html
index 51e1d3a7..546cf05c 100644
--- a/source/_templates/content-navigation.html
+++ b/source/_templates/content-navigation.html
@@ -1,31 +1,31 @@
 <div class="content__nav">
     <div class="container">
         <nav class="content__nav__inner">
-            <a target="_blank" rel="noreferrer" href="/docs/minio/kubernetes/upstream/index.html" class="{{ 'active' if doc_platform == 'kubernetes' }}">
+            <a rel="noreferrer" href="/docs/minio/kubernetes/upstream/index.html" class="{{ 'active' if doc_platform == 'kubernetes' }}">
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/kubernetes.svg',1) }}" alt="Kubernetes" />
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/kubernetes-inactive.svg',1) }}" alt="Kubernetes" />
                 Kubernetes
             </a>
          
-            <a target="_blank" rel="noreferrer" href="/docs/minio/container/index.html" class="{{ 'active' if doc_platform == 'container' }}">
+            <a rel="noreferrer" href="/docs/minio/container/index.html" class="{{ 'active' if doc_platform == 'container' }}">
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/docker.svg',1) }}" alt="Docker" />
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/docker-inactive.svg',1) }}" alt="Docker" />
                 Docker
             </a>
         
-            <a target="_blank" rel="noreferrer" href="/docs/minio/linux/index.html" class="{{ 'active' if doc_platform == 'linux' }}">
+            <a rel="noreferrer" href="/docs/minio/linux/index.html" class="{{ 'active' if doc_platform == 'linux' }}">
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/linux.svg',1) }}" alt="Linux" />
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/linux-inactive.svg',1) }}" alt="Linux" />
                 Linux
             </a>
         
-            <a target="_blank" rel="noreferrer" href="/docs/minio/macos/index.html" class="{{ 'active' if doc_platform == 'macos' }}">
+            <a rel="noreferrer" href="/docs/minio/macos/index.html" class="{{ 'active' if doc_platform == 'macos' }}">
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/macos.svg',1) }}" alt="macOS" />
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/macos-inactive.svg',1) }}" alt="macOS" />
                 macOS
             </a>
         
-            <a target="_blank" rel="noreferrer" href="/docs/minio/windows/index.html" class="{{ 'active' if doc_platform == 'windows' }}">
+            <a rel="noreferrer" href="/docs/minio/windows/index.html" class="{{ 'active' if doc_platform == 'windows' }}">
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/windows.svg',1) }}" alt="Windows" />
                 <img class="hidden-rm" src="{{ pathto('_static/img/icons/windows-inactive.svg',1) }}" alt="Windows" />
                 Windows