diff --git a/.zuul.yaml b/.zuul.yaml
index b1da91d2e785a22d0043464f783e6a1010342b68..9fe4eef296c814470ad889374d11fd925f4e060b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,11 +5,8 @@
       - openstack-lower-constraints-jobs
       - openstack-python3-victoria-jobs
       - publish-openstack-docs-pti
+      - build-release-notes-jobs-python3
     check:
       jobs:
-        - build-openstack-releasenotes
         - openstack-tox-cover:
             voting: false
-    gate:
-      jobs:
-        - build-openstack-releasenotes
diff --git a/doc/requirements.txt b/doc/requirements.txt
index e6bf20b90bbd036730b972fb834f6c6b07b93004..493eb54876b44bee17d371327a3113bc3d58dc89 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,3 @@
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.32.1 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 15fd521bce6927b3b34da2c4bb10234ca9626bb3..e6aa35bad2b3bb50b48187269159e3f18ccbb87f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -62,9 +62,9 @@ html_theme = 'openstackdocs'
 # html_static_path = ['static']
 
 # openstackdocstheme options
-repository_name = 'openstack/python-magnumclient'
-bug_project = 'python-magnumclient'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/python-magnumclient'
+openstackdocs_bug_project = 'python-magnumclient'
+openstackdocs_bug_tag = ''
 
 
 # Output file base name for HTML help builder.
diff --git a/lower-constraints.txt b/lower-constraints.txt
index b28fc552ab12ac550c86ee3907cacce414f23c65..1cf5047d34d2b471f366a242d7852560513cc9bd 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -47,7 +47,6 @@ msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-openstackdocstheme==1.32.1
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
@@ -97,8 +96,6 @@ Routes==2.3.1
 simplejson==3.5.1
 smmap==0.9.0
 snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-websupport==1.0.1
 statsd==3.2.1
 stevedore==1.20.0
 tenacity==3.2.1
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index c98828be33b033998758b23bff3aa91c820b52da..b2cf0a055ec7747633df7ee8cb160bbe27ca7582 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -271,6 +271,7 @@ texinfo_documents = [
 locale_dirs = ['locale/']
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/python-magnumclient'
-bug_project = 'python-magnumclient'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/python-magnumclient'
+openstackdocs_bug_project = 'python-magnumclient'
+openstackdocs_bug_tag = ''
+openstackdocs_auto_name = False