diff --git a/doc/requirements.txt b/doc/requirements.txt
index 517f5d2cc1..d27c40a4db 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,9 +1,8 @@
 # main dependencies
 -r ../requirements.txt
-sphinx!=1.6.6,!=1.6.7,!=2.1.0                          # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0 # BSD
 
-# we are using theme from this package
-oslosphinx                                             # Apache Software License
+openstackdocstheme>=2.2.0 # Apache-2.0
 
 # plugins
 rally-openstack
diff --git a/doc/source/conf.py b/doc/source/conf.py
index ed98566c77..99c5dc02bf 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -63,6 +63,9 @@ extensions = [
     "ext.plugin_reference",
     "ext.include_vars"
 ]
+if not on_rtd:
+    extensions.append("openstackdocstheme")
+
 todo_include_todos = True
 
 # Add any paths that contain templates here, relative to this directory.
@@ -136,21 +139,17 @@ pygments_style = "native"
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 if not on_rtd:
-    html_theme = "openstackrally"
+    html_theme = "openstackdocs"
 else:
     html_theme = "default"
+
 # 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.
 # html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-if not on_rtd:
-    import oslosphinx
-    theme_dir = os.path.join(os.path.dirname(oslosphinx.__file__), "theme")
-    html_theme_path = [theme_dir, "_templates"]
-else:
-    html_theme_path = []
+html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/doc/source/index.rst b/doc/source/index.rst
index ec9c0e21c1..bf0effe250 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -49,7 +49,7 @@ Contents
 For Contributors
 ================
 
-  .. toctree::
-     :maxdepth: 2
+.. toctree::
+   :maxdepth: 2
 
-     contribute
+   contribute