diff --git a/doc/source/conf.py b/doc/source/conf.py
index b38dd5ba0..f99cf758d 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -21,6 +21,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
+    'openstackdocstheme',
     'sphinx.ext.autodoc',
 ]
 
@@ -45,9 +46,6 @@ add_function_parentheses = True
 # unit titles (such as .. function::).
 add_module_names = True
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
 # -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
@@ -58,6 +56,7 @@ pygments_style = 'sphinx'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
+html_theme = 'openstackdocs'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
@@ -71,3 +70,8 @@ latex_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 # intersphinx_mapping = {'http://docs.python.org/': None}
+
+# openstackdocstheme options
+repository_name = 'openstack/tripleo-quickstart'
+bug_project = 'tripleo'
+bug_tag = 'documentation'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index d6e90348c..cf5cfa3f1 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -28,7 +28,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
@@ -102,7 +102,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
@@ -262,4 +262,9 @@ texinfo_documents = [
 #texinfo_no_detailmenu = False
 
 # -- Options for Internationalization output ------------------------------
-locale_dirs = ['locale/']
\ No newline at end of file
+locale_dirs = ['locale/']
+
+# openstackdocstheme options
+repository_name = 'openstack/tripleo-quickstart'
+bug_project = 'tripleo'
+bug_tag = 'documentation'
diff --git a/test-requirements.txt b/test-requirements.txt
index 706cc6378..fc27c95fa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,9 @@
+openstackdocstheme>=1.11.0  # Apache-2.0
 hacking<0.11,>=0.10
 
 bashate>=0.2 # Apache-2.0
 ansible-lint
 jenkins-job-builder
 docutils>=0.11
-sphinx>=1.5.1 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
 reno>=1.8.0  # Apache-2.0