diff --git a/doc/source/conf.py b/doc/source/conf.py
index 06462016..e594221f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,7 +24,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['oslosphinx']
+extensions = ['openstackdocstheme']
 templates_path = ['_templates']
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -86,7 +86,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -238,3 +238,8 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 # texinfo_no_detailmenu = False
+
+# openstackdocstheme options
+repository_name = 'openstack/tripleo-puppet-elements'
+bug_project = 'tripleo'
+bug_tag = 'documentation'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 70973691..0805aa08 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -27,7 +27,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
@@ -102,7 +102,8 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
+
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -263,3 +264,8 @@ texinfo_documents = [
 
 # -- Options for Internationalization output ------------------------------
 locale_dirs = ['locale/']
+
+# openstackdocstheme options
+repository_name = 'openstack/tripleo-puppet-elements'
+bug_project = 'tripleo'
+bug_tag = 'documentation'
diff --git a/test-requirements.txt b/test-requirements.txt
index 76671464..189cfcdf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
+openstackdocstheme>=1.11.0  # Apache-2.0
 hacking>=0.8.0,<0.9
 
 oslotest
-oslosphinx
-sphinx>=1.1.2,<1.2
+sphinx>=1.6.2 # BSD
 testrepository>=0.0.18
 reno>=1.8.0 # Apache-2.0