diff --git a/docs/source/conf.py b/docs/source/conf.py
index f26547f3..87bb27fe 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -47,7 +47,6 @@
 
 notfound_urls_prefix = "/pysnmp/"
 
-html_baseurl = "https://docs.lextudio.com/pysnmp/"
 sitemap_url_scheme = "{link}"
 sitemap_suffix_included = False
 
@@ -127,6 +126,9 @@
 
 # -- Options for HTML output ----------------------------------------------
 
+html_baseurl = f"https://docs.lextudio.com/pysnmp/v{version}"
+repo = "https://github.com/lextudio/pysnmp"
+
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = "furo"
@@ -136,13 +138,13 @@
 # documentation.
 
 html_theme_options = {
-    "source_repository": "https://github.com/lextudio/pysnmp",
-    "source_branch": "main",
+    "source_repository": repo,
+    "source_branch": f"release-{version}",
     "source_directory": "docs/source/",
     "footer_icons": [
         {
             "name": "GitHub",
-            "url": "https://github.com/lextudio/pysnmp",
+            "url": repo,
             "html": "",
             "class": "fa-brands fa-solid fa-github fa-2x",
         },
@@ -346,7 +348,7 @@
 
 # Configuration for Intersphinx
 intersphinx_mapping = {
-    "python": ("https://docs.python.org/3.7/", None),
+    "python": ("https://docs.python.org/3.8/", None),
     "pyasn1": ("https://pyasn1.readthedocs.io/en/latest/", None),
     "pysmi": ("https://docs.lextudio.com/pysmi/", None),
 }