diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5fb7c4e..150e0db 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,11 +31,9 @@ extensions = [
     #'sphinx.ext.intersphinx',
     'sphinxcontrib.programoutput',
     'ext.driver_doc',
+    'openstackdocstheme',
 ]
 
-if on_zuul:
-    extensions.append('oslosphinx')
-
 version = os_faults.get_version()
 # The full version, including alpha/beta/rc tags.
 release = os_faults.get_release()
@@ -74,12 +72,19 @@ modindex_common_prefix = ['os_faults.']
 # html_theme_path = ["."]
 # html_theme = '_theme'
 # html_static_path = ['static']
+html_theme = 'openstackdocs'
+
 if not on_zuul:
     html_theme = "sphinx_rtd_theme"
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
 
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+# html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
+
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
@@ -92,3 +97,8 @@ latex_documents = [
 
 # Example configuration for intersphinx: refer to the Python standard library.
 #intersphinx_mapping = {'http://docs.python.org/': None}
+
+# -- Options for openstackdocstheme -------------------------------------------
+repository_name = 'openstack/os-faults'
+bug_project = 'os-faults'
+bug_tag = ''
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 6dcb081..700f225 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -38,7 +38,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'oslosphinx',
+    'openstackdocstheme',
     'reno.sphinxext',
 ]
 
@@ -111,7 +111,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
@@ -150,6 +150,7 @@ html_static_path = ['_static']
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 # html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -273,3 +274,8 @@ texinfo_documents = [
 
 # -- Options for Internationalization output ------------------------------
 locale_dirs = ['locale/']
+
+# -- Options for openstackdocstheme -------------------------------------------
+repository_name = 'openstack/os-faults'
+bug_project = 'os-faults'
+bug_tag = ''
diff --git a/test-requirements.txt b/test-requirements.txt
index 8871145..f72ee21 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,10 +12,10 @@ coverage>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.5.1 # BSD
+sphinx>=1.6.2 # BSD
 sphinxcontrib-programoutput # BSD
 sphinx_rtd_theme # MIT
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.11.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD