diff --git a/doc/requirements.txt b/doc/requirements.txt
index c75634f..1fc85f4 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
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-reno>=2.5.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+reno>=3.1.0 # Apache-2.0
 sphinxcontrib-httpdomain>=1.3.0 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 25f52c2..3a4a58e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -82,7 +82,7 @@ language = None
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 
 # -- Options for HTML output ----------------------------------------------
@@ -111,9 +111,9 @@ html_theme = 'openstackdocs'
 # html_sidebars = {}
 
 # -- Options for openstackdocstheme --------------------------------------
-repository_name = 'openstack/heat-agents'
-bug_project = '990'
-bug_tag = 'docs'
+openstackdocs_repo_name = 'openstack/heat-agents'
+openstackdocs_auto_name = False
+openstackdocs_use_storyboard = True
 
 # -- Options for HTMLHelp output ------------------------------------------
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index c2456aa..0cc971d 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -47,9 +47,9 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/heat-agents'
-bug_project = 'heat'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/heat-agents'
+openstackdocs_auto_name = False
+openstackdocs_use_storyboard = True
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -91,7 +91,7 @@ language = None
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -104,7 +104,6 @@ todo_include_todos = False
 #
 html_theme = 'openstackdocs'
 
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # 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