diff --git a/doc/source/conf.py b/doc/source/conf.py
index d1d38e467..5f266b991 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -20,7 +20,7 @@ sys.path.insert(0,os.path.abspath('_themes'))
 
 # -- Project information -----------------------------------------------------
 
-project = u'StarlingX'
+project = u'StarlingX R6.0'
 copyright = '2018, StarlingX'
 author = 'StarlingX'
 
@@ -178,6 +178,6 @@ starlingxdocs_plus_project = 'StarlingX'
 starlingxdocs_plus_auto_name = False
 starlingxdocs_plus_bug_project = 'starlingx'
 starlingxdocs_plus_bug_tag = 'stx.docs'
-starlingxdocs_plus_this_version = "latest"
+starlingxdocs_plus_this_version = "r/stx.6.0"
 # starlingxdocs_plus_other_versions = [("even later","even-later"),("sooner","sooner")]
-starlingxdocs_plus_other_versions = [("Version 5.0","r/stx.5.0")]
+starlingxdocs_plus_other_versions = [("r/stx.5.0","r/stx.5.0"),("Latest","/")]
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 39158cbaf..d7826aa1c 100755
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -9,7 +9,7 @@ everything needed to deploy an edge cloud on one, two, or up to 100 servers.
 
 * See the :ref:`release-notes`.
 * Download the `R6.0 StarlingX ISO image
-  <http://mirror.starlingx.cengn.ca/mirror/starlingx/release/6.0/centos/flock/outputs/>`_
+  <http://mirror.starlingx.cengn.ca/mirror/starlingx/release/6.0.0/centos/flock/outputs/>`_
   from the CENGN StarlingX mirror.
 
 For more information about the StarlingX project, refer to the