diff --git a/doc/source/conf.py b/doc/source/conf.py
index 04ead7b..fa9cabc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -40,6 +40,10 @@ master_doc = 'index'
 project = u'sphinx-feature-classification'
 copyright = u'2017, OpenStack Foundation'
 
+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/sphinx-feature-classification'
+openstackdocs_use_storyboard = True
+
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
 
@@ -48,7 +52,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 7795d94..a749cc0 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -29,6 +29,11 @@ master_doc = 'index'
 project = u'sphinx_feature_classification Release Notes'
 copyright = u'2016, OpenStack Foundation'
 
+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/sphinx-feature-classification'
+openstackdocs_auto_name = False
+openstackdocs_use_storyboard = True
+
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
@@ -40,7 +45,7 @@ release = ''
 version = ''
 
 # 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 ff02351..01ef731 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,13 +4,13 @@
 
 hacking>=3.0,<3.1.0 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
-openstackdocstheme>=1.17.0  # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 ddt>=1.0.1  # MIT
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.6.8 # BSD
+sphinx>=2.0.0,!=2.1.0 # BSD
 testrepository>=0.0.18  # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
 # releasenotes
-reno>=1.8.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0