diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9fbdad3..14cdb6e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -18,7 +18,15 @@ sys.path.append(os.path.abspath('exts'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'oslosphinx', 'clidoc']
+extensions = ['sphinx.ext.autodoc', 'openstackdocstheme', 'clidoc']
+
+# openstackdocstheme options
+repository_name = 'openstack/python-manilaclient'
+bug_project = 'python-manilaclient'
+bug_tag = ''
+
+# Must set this variable to include year, month, day, hours, and minutes.
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -60,3 +68,4 @@ pygments_style = 'sphinx'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'python-manilaclientdoc'
+html_theme = 'openstackdocs'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index fc3af02..58377e3 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -39,10 +39,16 @@ import pbr.version
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
+# openstackdocstheme options
+repository_name = 'openstack/python-manilaclient'
+bug_project = 'python-manilaclient'
+bug_tag = ''
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -114,7 +120,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
diff --git a/test-requirements.txt b/test-requirements.txt
index 60e2efd..9f30a8b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 sphinx!=1.6.1,>=1.5.1 # BSD
 tempest>=14.0.0 # Apache-2.0