diff --git a/doc/source/conf.py b/doc/source/conf.py
index f953a90..a6a2cf3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -32,7 +32,7 @@ extensions = [
     'rst2pdf.pdfbuilder',
     'sphinx.ext.autodoc',
     'sphinxcontrib.httpdomain',
-    'oslosphinx',
+    'openstackdocstheme',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -107,6 +107,8 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
+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
 # documentation.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index b52ee6e..26d728a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -21,7 +21,7 @@ Contents
     introduction.rst
     summits_recaps/index
     methodologies/index
-    labs/index.rst
+    labs/index
     test_plans/index
     test_results/index
     issues/index
diff --git a/requirements.txt b/requirements.txt
index 6b2609c..6ce12c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
-oslosphinx>=2.5.0 # Apache-2.0
+openstackdocstheme>=1.11.0  # Apache-2.0
+sphinx>=1.6.2 # BSD
+
 rst2pdf
 six>=1.9.0
-sphinx>=1.5.1 # BSD  -- to avoid https://sourceforge.net/p/docutils/bugs/301/
 sphinxcontrib-httpdomain
 sphinx_rtd_theme