diff --git a/doc/requirements.txt b/doc/requirements.txt
index 9b862b2..8d56e6a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,5 @@
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.31.2 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # releasenotes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3757229..9edab98 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -21,8 +21,10 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/os-traits'
-bug_project = 'os-traits'
+openstackdocs_repo_name = 'openstack/os-traits'
+openstackdocs_pdf_link = True
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'os-traits'
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -42,7 +44,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 d22b222..d822c6a 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -28,8 +28,9 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/os-traits'
-bug_project = 'os-traits'
+openstackdocs_repo_name = 'openstack/os-traits'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'os-traits'
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -56,7 +57,7 @@ version = ''
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 
 # -- Options for HTML output ----------------------------------------------