diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6723b32dc..81f92e29d 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,5 +3,5 @@
 # process, which may cause wedges in the gate later.
 sphinx>=1.6.2,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'  # BSD
 sphinx>=1.6.2,!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'  # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index cc02be88f..84cc5dba1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -36,7 +36,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'tripleoclient'
 copyright = u'2017 Red Hat, Inc.'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -60,15 +59,15 @@ html_theme = 'openstackdocs'
 # html_static_path = ['static']
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
+htmlhelp_basename = 'tripleoclientdoc'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
     ('index',
-     '%s.tex' % project,
-     u'%s Documentation' % project,
+     'tripleoclient.tex',
+     u'tripleoclient Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
@@ -81,5 +80,4 @@ bug_project = 'python-tripleoclient'
 bug_tag = ''
 
 # Last updated timestamp
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 autoprogram_cliff_application = 'openstack'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index a96e463e5..aaf256665 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -44,7 +44,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-tripleoclient Release Notes'
 copyright = u'2016, TripleO Developers'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -101,7 +100,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
@@ -184,17 +183,6 @@ htmlhelp_basename = 'python-tripleoclientReleaseNotesdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).