diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 89cd3fcc..53124e12 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -58,9 +58,10 @@ master_doc = 'index'
 project = u'Data Protection API Reference'
 copyright = u'OpenStack Foundation'
 
-repository_name = 'openstack/karbor'
-bug_project = 'karbor'
-bug_tag = 'api-ref'
+openstackdocs_repo_name = 'openstack/karbor'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'karbor'
+openstackdocs_bug_tag = 'api-ref'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -89,7 +90,7 @@ add_module_names = False
 show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for man page output ----------------------------------------------
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0692d713..bdf4338d 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -71,7 +71,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'
 
 # -- sphinxcontrib.apidoc configuration --------------------------------------
 
@@ -107,6 +107,7 @@ latex_documents = [
 ]
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/karbor'
-bug_project = project.lower()
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/karbor'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = project.lower()
+openstackdocs_bug_tag = ''
diff --git a/lower-constraints.txt b/lower-constraints.txt
index c793383b..b7f685bb 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -57,7 +57,7 @@ netaddr==0.7.19
 netifaces==0.10.6
 networkx==1.11
 oauthlib==2.0.6
-openstackdocstheme==2.0.0
+openstackdocstheme==2.2.1
 openstacksdk==0.12.0
 os-api-ref==1.4.0
 os-client-config==1.29.0
@@ -112,7 +112,7 @@ python-swiftclient==3.2.0
 python-troveclient==2.2.0
 pytz==2018.3
 PyYAML==3.12
-reno==2.5.0
+reno==3.1.0
 repoze.lru==0.7
 requests-oauthlib==0.8.0
 requests==2.14.2
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 77bbf020..e7b4238c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -47,9 +47,10 @@ version = ''
 release = ''
 
 # openstackdocstheme options
-repository_name = 'openstack/karbor'
-bug_project = project.lower()
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/karbor'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = project.lower()
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -81,7 +82,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 = []
diff --git a/test-requirements.txt b/test-requirements.txt
index bb732247..11248863 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -25,7 +25,7 @@ python-manilaclient>=1.16.0 # Apache-2.0
 
 # Documentation
 sphinx>=2.0.0,!=2.1.0 # BSD
-reno>=2.5.0 # Apache-2.0
-openstackdocstheme>=2.0.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD