diff --git a/doc/source/conf.py b/doc/source/conf.py
index b412421..759ac67 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -36,8 +36,10 @@ project = u'contributor-guide'
 copyright = u'2017, OpenStack Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/contributor-guide'
-use_storyboard = True
+openstackdocs_repo_name = 'openstack/contributor-guide'
+openstackdocs_auto_name = False
+openstackdocs_auto_version = False
+openstackdocs_use_storyboard = True
 
 # No need to show a version number
 version = ''
@@ -51,7 +53,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/test-requirements.txt b/test-requirements.txt
index d977e73..530e05d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
-openstackdocstheme>=1.28.0  # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 doc8>=0.6.0  # Apache-2.0