diff --git a/doc/requirements.txt b/doc/requirements.txt
index 81f812be..c93502d0 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 yasfb>=0.5.1
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 097ed196..040fc098 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -35,9 +35,10 @@ extensions = ['sphinx.ext.autodoc',
              ]
 
 # openstackdocstheme options
-repository_name = 'openstack/cinder-specs'
-bug_project = 'cinder-specs'
-bug_tag = 'doc'
+openstackdocs_repo_name = 'openstack/cinder-specs'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'cinder-specs'
+openstackdocs_bug_tag = 'doc'
 
 # Feed configuration for yasfb
 feed_base_url = 'http://specs.openstack.org/openstack/cinder-specs'
diff --git a/test-requirements.txt b/test-requirements.txt
index 861948d0..8a5fea7c 100644
--- a/test-requirements.txt
+++ b/test-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>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 flake8
 yasfb>=0.5.1