diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 852dd867d2..75040e5440 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -67,7 +67,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Shared File Systems API Reference'
 copyright = u'2010-present, OpenStack Foundation'
 
 # openstackdocstheme options
@@ -75,16 +74,6 @@ repository_name = 'openstack/manila'
 bug_project = 'manila'
 bug_tag = 'api-ref'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-from manila.version import version_info
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-# The short X.Y version.
-version = version_info.version_string()
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
@@ -171,11 +160,6 @@ todo_include_todos = False
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not None, a 'Last updated on:' timestamp is inserted at every page
-# bottom, using the given strftime format.
-# The empty string is equivalent to '%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.
 # html_use_smartypants = True
diff --git a/doc/requirements.txt b/doc/requirements.txt
index f9d85d8bf7..4f75977e17 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 85bdadabee..99792ca9aa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,9 +25,8 @@
 import eventlet
 import sys
 import os
-import warnings
 
-import openstackdocstheme
+import warnings
 
 # NOTE(dims): monkey patch subprocess to prevent failures in latest eventlet
 # See https://github.com/eventlet/eventlet/issues/398
@@ -71,7 +70,6 @@ sample_policy_basename = '_static/manila'
 repository_name = 'openstack/manila'
 bug_project = 'manila'
 bug_tag = 'docs'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 todo_include_todos = True
 
@@ -88,20 +86,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'manila'
 copyright = u'2010-present, Manila contributors'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-from manila.version import version_info
-# The full version, including alpha/beta/rc tags.
-release = version_info.release_string()
-# The short X.Y version.
-version = version_info.version_string()
-
-
 # A few variables have to be set for the log-a-bug feature.
 # gitsha: The SHA checksum of the bug description. Automatically extracted
 # from git log.
@@ -179,14 +165,12 @@ man_pages = [
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
-
-
 # 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
 # documentation.
-html_theme_options = {}
+html_theme_options = {
+    "show_other_versions": "True",
+}
 
 # 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 38e315132f..3b07c5bc67 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -30,8 +30,6 @@
 
 # -- General configuration ------------------------------------------------
 
-import openstackdocstheme
-
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
 
@@ -47,7 +45,6 @@ extensions = [
 repository_name = 'openstack/manila'
 bug_project = 'manila'
 bug_tag = 'release notes'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -62,15 +59,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Manila Release Notes'
 copyright = u'2015, Manila Developers'
 
-# Release notes are version independent.
-# The short X.Y version.
-version = ''
-# The full version, including alpha/beta/rc tags.
-release = ''
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None