diff --git a/doc/requirements.txt b/doc/requirements.txt
index 7e4a012..510dc57 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +1,8 @@
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
-openstackdocstheme>=1.20.0  # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.1 # BSD
 # releasenotes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 
 # PDF Docs
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 185fc5b..e60681f 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -41,19 +41,10 @@ master_doc = 'index'
 # General information about the project.
 copyright = u'2018-2019, OpenStack Octavia Team'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# Version info
-from octavia_lib.version import version_info as octavia_lib_version
-release = octavia_lib_version.release_string()
-# The short X.Y version.
-version = octavia_lib_version.version_string()
-
 # openstackdocstheme options
-repository_name = 'openstack/octavia-lib'
-use_storyboard = True
+openstackdocs_repo_name = 'openstack/octavia-lib'
+openstackdocs_pdf_link = True
+openstackdocs_use_storyboard = True
 
 apidoc_output_dir = 'reference/modules'
 apidoc_module_dir = '../../octavia_lib'
@@ -72,7 +63,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index ccbc2b1..f5be1fb 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -55,8 +55,8 @@ master_doc = 'index'
 copyright = u'2017, OpenStack Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/octavia-lib'
-use_storyboard = True
+openstackdocs_repo_name = 'openstack/octavia-lib'
+openstackdocs_use_storyboard = True
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -88,7 +88,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []