diff --git a/doc/requirements.txt b/doc/requirements.txt
index d3373815..44cb2082 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,6 @@
 # This is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
-openstackdocstheme>=1.30.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # This is required for the releasenotes build jobs
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 72b4b043..6e618d23 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -86,7 +86,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 = []
@@ -250,6 +250,6 @@ texinfo_documents = [
 locale_dirs = ['locale/']
 
 # openstackdocstheme options
-repository_name = 'openstack/puppet-manila'
-bug_project = 'puppet-manila'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/puppet-manila'
+openstackdocs_bug_project = 'puppet-manila'
+openstackdocs_bug_tag = ''