diff --git a/doc/source/conf.py b/doc/source/conf.py
index 127f7b4..c09dc1c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -58,6 +58,10 @@ master_doc = 'index'
 project = u'OpenStack SIG Governance'
 copyright = u'2017, OpenStack Meta SIG'
 
+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/governance-sigs'
+openstackdocs_auto_name = False
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
@@ -88,7 +92,7 @@ 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 = []
diff --git a/test-requirements.txt b/test-requirements.txt
index aaaf4b8..54f138b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,6 @@
 # process, which may cause wedges in the gate later.
 # needed for doc build
 docutils>=0.11,!=0.13.1  # OSI-Approved Open Source, Public Domain
-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
 yamllint