diff --git a/doc/requirements.txt b/doc/requirements.txt
index 721351e..6383eda 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,5 +2,5 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx>=1.8.0,!=2.1.0 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0f740f7..241d6ae 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,9 +78,9 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # openstackdocstheme options
-repository_name = 'openstack/python-aodhclient'
-bug_project = 'python-aodhclient'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/python-aodhclient'
+openstackdocs_bug_project = 'python-aodhclient'
+openstackdocs_bug_tag = ''
 copyright = u'2015, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -91,7 +91,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 09c452f..5565a15 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -52,9 +52,9 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # openstackdocstheme options
-repository_name = 'openstack/python-aodhclient'
-bug_project = 'python-aodhclient'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/python-aodhclient'
+openstackdocs_bug_project = 'python-aodhclient'
+openstackdocs_bug_tag = ''
 copyright = u'2015-present, Aodh developers'
 
 # Release notes are version independent.
@@ -93,7 +93,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 = []