diff --git a/doc/requirements.txt b/doc/requirements.txt
index fca0c498d..f527336bc 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,7 +2,7 @@
 # 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
-reno>=2.5.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 951dbbf63..793361a26 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -35,9 +35,10 @@ if not on_rtd:
     extensions.append('openstackdocstheme')
 
 # openstackdocstheme options
-repository_name = 'openstack/congress'
-bug_project = 'congress'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/congress'
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = 'congress'
+openstackdocs_bug_tag = ''
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
 # execute "export SPHINX_DEBUG=1" in your terminal to disable
@@ -73,7 +74,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'
 
 # A list of glob-style patterns that should be excluded when looking for
 # source files. They are matched against the source file names relative to the
@@ -100,7 +101,6 @@ html_static_path = ['_static']
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
 
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
 latex_use_xindy = False
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 6c3a356c1..7f221a784 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -54,7 +54,6 @@ munch==2.2.0
 murano-pkg-check==0.3.0
 netaddr==0.7.18
 netifaces==0.10.6
-openstackdocstheme==1.18.1
 openstacksdk==0.12.0
 os-client-config==1.29.0
 os-service-types==1.2.0
@@ -112,7 +111,6 @@ python-swiftclient==3.2.0
 python-tackerclient==0.8.0
 pytz==2018.3
 PyYAML==3.10.0
-reno==2.5.0
 repoze.lru==0.7
 requests-mock==1.2.0
 requests==2.14.2
@@ -123,8 +121,6 @@ semantic-version==2.6.0
 simplejson==3.13.2
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.8.0
-sphinxcontrib-websupport==1.0.1
 sqlalchemy-migrate==0.11.0
 SQLAlchemy==1.2.5
 sqlparse==0.2.4
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 8b1068dab..f6f4dbd6c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -41,9 +41,10 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/congress'
-bug_project = 'congress'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/congress'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'congress'
+openstackdocs_bug_tag = ''
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -98,7 +99,7 @@ exclude_patterns = []
 # 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 = []
@@ -147,10 +148,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-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