diff --git a/doc/requirements.txt b/doc/requirements.txt
index 10101c2f..b42fb237 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,6 @@
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a2a52b02..59cdfac2 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -174,7 +174,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -183,8 +183,9 @@ pygments_style = 'sphinx'
 html_theme = 'openstackdocs'
 
 # openstackdocstheme options
-repository_name = 'openstack/ironic-ui'
-use_storyboard = True
+openstackdocs_repo_name = 'openstack/ironic-ui'
+openstackdocs_pdf_link = True
+openstackdocs_use_storyboard = True
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'ironic-uidoc'
diff --git a/lower-constraints.txt b/lower-constraints.txt
index b41b28cb..1954fdbe 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -47,7 +47,6 @@ msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
-openstackdocstheme==1.20.0
 openstacksdk==0.12.0
 os-client-config==1.29.0
 os-service-types==1.2.0
@@ -85,7 +84,6 @@ python-swiftclient==3.5.0
 pytz==2018.3
 PyYAML==3.12
 rcssmin==1.0.6
-reno==2.5.0
 requests==2.18.4
 requestsexceptions==1.4.0
 rfc3986==1.1.0
@@ -95,8 +93,6 @@ semantic-version==2.6.0
 simplejson==3.13.2
 six==1.11.0
 snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinxcontrib-websupport==1.0.1
 stevedore==1.28.0
 testrepository==0.0.18
 testscenarios==0.4
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index bb9adc63..9c03ee4c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -113,7 +113,7 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -133,9 +133,9 @@ todo_include_todos = False
 html_theme = 'openstackdocs'
 
 # openstackdocstheme options
-repository_name = 'openstack/ironic-ui'
-bug_project = 'ironic-ui'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/ironic-ui'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False
 
 # 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
@@ -177,9 +177,6 @@ bug_tag = ''
 #
 # html_extra_path = []
 
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #