diff --git a/doc/requirements.txt b/doc/requirements.txt
index 26cc079..4fa297d 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,4 @@
+openstackdocstheme>=2.2.1 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1528918..e73ed1a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -22,7 +22,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
-    'oslosphinx',
+    'openstackdocstheme',
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -60,7 +60,7 @@ pygments_style = 'native'
 # The theme to use for HTML and HTML Help pages. Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
-# html_theme = '_theme'
+html_theme = 'openstackdocs'
 # html_static_path = []
 
 # Output file base name for HTML help builder.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 33032dd..e160e5e 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,6 +1,6 @@
 
 Welcome to Mistral Dashboard's documentation!
-============================================
+=============================================
 
 Contents:
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 99c1916..24aa506 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -11,16 +11,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('../..'))
 # -- General configuration ----------------------------------------------------
 
 # 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',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
@@ -60,6 +56,7 @@ pygments_style = 'native'
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
 # html_theme = '_theme'
+html_theme = 'openstackdocs'
 # html_static_path = []
 
 # Output file base name for HTML help builder.