diff --git a/doc/source/conf.py b/doc/source/conf.py
index 19f6e9dac6..444f89cb0d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -32,6 +32,9 @@ import subprocess
 import sys
 import warnings
 
+import openstackdocstheme
+
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -47,7 +50,6 @@ sys.path = [
 extensions = ['sphinx.ext.coverage',
               'sphinx.ext.ifconfig',
               'sphinx.ext.graphviz',
-              'oslosphinx',
               'stevedore.sphinxext',
               'oslo_config.sphinxext',
               'sphinx.ext.autodoc',
@@ -68,6 +70,7 @@ config_generator_config_file = [
      '_static/glance-scrubber'),
 ]
 
+
 # Add any paths that contain templates here, relative to this directory.
 # templates_path = []
 
@@ -176,6 +179,7 @@ man_pages = [
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
 # html_theme = '_theme'
+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
@@ -184,6 +188,7 @@ man_pages = [
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = ['_theme']
+html_theme_path = [openstackdocstheme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 00c3e5f591..ed0ae54876 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -31,6 +31,8 @@
 
 # -- General configuration ------------------------------------------------
 
+import openstackdocstheme
+
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
 
@@ -38,7 +40,6 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
     'reno.sphinxext',
 ]
 
@@ -112,7 +113,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
@@ -121,6 +122,7 @@ html_theme = 'default'
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
+html_theme_path = [openstackdocstheme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/test-requirements.txt b/test-requirements.txt
index 0952dad61b..1e9cc5dc81 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -33,5 +33,5 @@ python-swiftclient>=3.2.0 # Apache-2.0
 
 # Documentation
 os-api-ref>=1.0.0 # Apache-2.0
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.11.0  # Apache-2.0
 reno!=2.3.1,>=1.8.0 # Apache-2.0