diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index 49d3a78..fa2f319 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -54,9 +54,9 @@ master_doc = 'index'
 copyright = u'2016, OpenStack contributors'
 
 # Settings for openstackdocstheme
-repository_name = 'openstack/charm-deployment-guide'
-bug_project = 'charm-deployment-guide'
-bug_tag = u'deployment-guide'
+openstackdocs_repo_name = 'openstack/charm-deployment-guide'
+openstackdocs_bug_project = 'charm-deployment-guide'
+openstackdocs_bug_tag = u'deployment-guide'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/requirements.txt b/requirements.txt
index 3a1ae93..4964b0c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,5 +4,5 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
-sphinx>=1.8.0,!=2.1.0 # BSD
-openstackdocstheme>=1.30.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0