diff --git a/conf.yaml b/conf.yaml
index 2a7ab6b856384..8d233cbced8c0 100644
--- a/conf.yaml
+++ b/conf.yaml
@@ -21,7 +21,7 @@ repos:
     curator:              https://github.com/elastic/curator.git
     ecs:                  https://github.com/elastic/ecs.git
     elasticsearch-hadoop: https://github.com/elastic/elasticsearch-hadoop.git
-    elasticsearch-js:     https://github.com/elastic/elasticsearch-js-legacy.git
+    elasticsearch-js:     https://github.com/elastic/elasticsearch-js.git
     elasticsearch-net:    https://github.com/elastic/elasticsearch-net.git
     elasticsearch-php:    https://github.com/elastic/elasticsearch-php
     elasticsearch-php-cn: https://github.com/elasticsearch-cn/elasticsearch-php.git
@@ -309,11 +309,12 @@ contents:
               -
                 title:      JavaScript API
                 prefix:     javascript-api
-                current:    15.x
-                branches:   [ 15.x ]
+                current:    7.x
+                branches:   [ master, 7.x, 6.x, 5.x, 15.x ]
                 index:      docs/index.asciidoc
                 tags:       Clients/JavaScript
                 subject:    Clients
+                asciidoctor: true
                 sources:
                   -
                     repo:   elasticsearch-js
diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh
index 6dd0385402e0d..92bcc9eb557d6 100644
--- a/doc_build_aliases.sh
+++ b/doc_build_aliases.sh
@@ -116,7 +116,7 @@ alias docbldjvr='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs
 
 alias docbldejv='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/java-api/index.asciidoc --chunk 1'
 
-alias docbldejs='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch-js/docs/index.asciidoc'
+alias docbldejs='$GIT_HOME/docs/build_docs --asciidoctor --doc $GIT_HOME/elasticsearch-js/docs/index.asciidoc'
 
 alias docbldegr='$GIT_HOME/docs/build_docs --asciidoctor --doc $GIT_HOME/elasticsearch/docs/groovy-api/index.asciidoc'