diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh
index 31ea6a2d..8107546b 100755
--- a/docs/src/main/asciidoc/ghpages.sh
+++ b/docs/src/main/asciidoc/ghpages.sh
@@ -305,11 +305,11 @@ the script will work in the following manner:
 - if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
     with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+    switch to gh-pages of that repo and copy the generated docs to [docs/<project-name>/<version>]
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+    switch to gh-pages of that repo and copy the generated docs to [docs/<project-name>/<version>]
 - if the release train switch is passed (-r) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<version>`
+    switch to gh-pages of that repo and copy the generated docs to [docs/<version>]
 
 USAGE:
 
diff --git a/docs/src/test/bash/build-helper.sh b/docs/src/test/bash/build-helper.sh
index f02a104d..30785202 100755
--- a/docs/src/test/bash/build-helper.sh
+++ b/docs/src/test/bash/build-helper.sh
@@ -24,7 +24,7 @@ function shellcheck_installed() {
     shellcheck --version && return 0 || return 1
 }
 
-SHELLCHECK_VERSION="v0.4.6"
+SHELLCHECK_VERSION="v0.6.0"
 SHELLCHECK_INSTALLED="$( shellcheck_installed && echo "true" || echo "false" )"
 echo "Shellcheck installed? [${SHELLCHECK_INSTALLED}]"
 if [[ "${SHELLCHECK_INSTALLED}" != "false" ]]; then
@@ -36,7 +36,7 @@ echo "Shellcheck binary location [${SHELLCHECK_BIN}]"
 
 case $1 in
     download-shellcheck)
-        if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then
+        if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" && "${SHELLCHECK_INSTALLED}" == "false" ]]; then
             SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz"
             SHELLCHECK_ARCHIVE_SHA512SUM="d9ac3e4fb2383b2d6862415e8052459ce24fd5402806b9ce739990d5c1cccebe4121288df29de32dcef5daa115874ddf7f9730de256bf134ee11cd9704aaa64c"
             if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then