diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2865f2c04..b31c1f654 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -55,7 +55,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 --------------------------------------------------
 
@@ -83,9 +83,10 @@ latex_documents = [
 # intersphinx_mapping = {'http://docs.python.org/': None}
 
 # openstackdocstheme options
-repository_name = 'openstack/tripleo-ansible'
-bug_project = 'tripleo'
-bug_tag = 'documentation'
+openstackdocs_repo_name = 'openstack/tripleo-ansible'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'tripleo'
+openstackdocs_bug_tag = 'documentation'
 
 needed_module_utils = [
     'baremetal_deploy',
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index 9c4bd872d..52cd1a00a 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -15,10 +15,9 @@ netaddr
 jinja2>=2.8.0,<3
 
 # this is required for the docs build jobs
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
-openstackdocstheme>=1.29.2 # Apache-2.0
-reno>=2.11.3 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 doc8>=0.8.0 # Apache-2.0
 bashate>=0.6.0 # Apache-2.0
 metalsmith>=0.13.0 # Apache-2.0
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 7ac1bd235..42725d988 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -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 = []
@@ -264,6 +264,7 @@ texinfo_documents = [
 locale_dirs = ['locale/']
 
 # openstackdocstheme options
-repository_name = 'openstack/tripleo-ansible'
-bug_project = 'tripleo'
-bug_tag = 'documentation'
+openstackdocs_repo_name = 'openstack/tripleo-ansible'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'tripleo'
+openstackdocs_bug_tag = 'documentation'