diff --git a/doc/requirements.txt b/doc/requirements.txt
index 29695ca4a1..9580f87895 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,3 @@
 # this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 16ec627208..1aa7b2fc86 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -69,15 +69,16 @@ add_module_names = False
 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 = ['requirements-doc.']
 
 # openstackdocstheme options
-repository_name = 'openstack/requirements'
-bug_project = 'openstack-requirements'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/requirements'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'openstack-requirements'
+openstackdocs_bug_tag = ''
 
 # -- Options for man page output ----------------------------------------------
 man_pages = []