diff --git a/doc/requirements.txt b/doc/requirements.txt
index f0dc0458..bd5c9651 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.
-sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
-openstackdocstheme>=1.18.1 # 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
 sphinxcontrib-apidoc>=0.2.0  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0bf98374..582d001d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,10 +25,10 @@ extensions = ['openstackdocstheme',
               'sphinxcontrib.apidoc']
 
 # openstackdocstheme options
-repository_name = 'openstack/glance_store'
-bug_project = 'glance-store'
-bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+openstackdocs_repo_name = 'openstack/glance_store'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'glance-store'
+openstackdocs_bug_tag = ''
 
 # sphinxcontrib.apidoc options
 apidoc_module_dir = '../../glance_store'
@@ -63,7 +63,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 --------------------------------------------------
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 1e9ba06b..e5f464de 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -36,7 +36,6 @@ mox3==0.25.0
 msgpack==0.5.6
 netaddr==0.7.19
 netifaces==0.10.6
-openstackdocstheme==1.18.1
 os-brick==2.6.0
 os-client-config==1.29.0
 oslo.concurrency==3.26.0
@@ -63,7 +62,6 @@ python-subunit==1.0.0
 python-swiftclient==3.2.0
 pytz==2018.3
 PyYAML==3.12
-reno==2.5.0
 requests==2.14.2
 requestsexceptions==1.4.0
 requests-mock==1.2.0
@@ -72,8 +70,6 @@ rfc3986==1.1.0
 six==1.10.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinxcontrib-websupport==1.0.1
 stestr==2.0.0
 stevedore==1.20.0
 testscenarios==0.4
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index b91665c9..b64031dc 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -38,10 +38,10 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/glance_store'
-bug_project = 'glance-store'
-bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+openstackdocs_repo_name = 'openstack/glance_store'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'glance-store'
+openstackdocs_bug_tag = ''
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -93,7 +93,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 = []