diff --git a/_templates/versions.html b/_templates/versions.html
index 1dcd06b9c37d3b4139b041b5a87da05d8ffc0f9f..d0228aeac47410c0dbdd063f33d946300e89235f 100644
--- a/_templates/versions.html
+++ b/_templates/versions.html
@@ -8,13 +8,13 @@
     <div class="rst-other-versions">
       <dl>
         <dt>{{ _('Document Release Versions') }}</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
+          <dd><a class="reference internal" href="">latest</a></dd>
+          <dd><a class="reference internal" href="0.0.7">0.0.7</a></dd>
+          <dd><a class="reference internal" href="0.1.0">0.1.0</a></dd>
       </dl>
       <dl>
         <dt>{{ _('Downloads') }}</dt>
-        <dd><a href="{{ html_baseurl }}/beagleboard-docs.pdf">PDF</a></dd>
+        <dd><a class="reference internal" href="beagleboard-docs.pdf">PDF</a></dd>
       </dl>
       <dl>
         <dt>{{ _('BeagleBoard.org Links') }}</dt>
diff --git a/conf.py b/conf.py
index 798fc6748ba3ad8419414186997f2e635ce20229..f09fb5ec42b5e8032c9d48f503795896cc63602b 100644
--- a/conf.py
+++ b/conf.py
@@ -10,7 +10,6 @@ from pathlib import Path
 import re
 # sys.path.insert(0, os.path.abspath('.'))
 # sys.path.append('.')
-from sphinx.cmd.build import get_parser
 import sphinx_rtd_theme
 
 BBDOCS_BASE = Path(__file__).resolve().parents[0]
@@ -55,6 +54,7 @@ html_last_updated_fmt = "%b %d, %Y"
 html_domain_indices = False
 html_split_index = True
 html_show_sourcelink = False
+html_baseurl = 'docs.beagleboard.io'
 
 # parse version from 'VERSION' file
 with open(BBDOCS_BASE  / "VERSION") as f:
@@ -89,14 +89,15 @@ docs_title = "Docs / {}".format(version if is_release else "Latest")
 
 html_context = {
     "display_gitlab": True,
+    "gitlab_host": "git.beagleboard.org",
+    "gitlab_user": "docs",
+    "gitlab_repo": "docs.beagleboard.io",
+    "gitlab_version": "main",
+    "conf_py_path": "/",
     "show_license": True,
     "docs_title": docs_title,
     "is_release": is_release,
-    "current_version": version,
-    "versions": (
-        ("latest", "/"),
-        ("0.1.0", "/0.1.0/"),
-    )
+    "current_version": version
 }
 
 # -- Options for LaTeX output ---------------------------------------------