diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index d679138..4efd576 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -56,20 +56,12 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Deployment Guide for OpenStack Chef Cookbooks'
-repository_name = 'openstack/openstack-chef'
-bug_project = 'openstack-chef'
-bug_tag = u'deploy-guide'
+openstackdocs_repo_name = 'openstack/openstack-chef'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'openstack-chef'
+openstackdocs_bug_tag = u'deploy-guide'
 copyright = u'2019, OpenStack contributors'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.1'
-# The full version, including alpha/beta/rc tags.
-release = '0.1'
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
@@ -100,7 +92,7 @@ exclude_patterns = ["common_prerequisites.rst", "common_configure.rst"]
 # 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 = []
diff --git a/doc/requirements.txt b/doc/requirements.txt
index b1ff253..e1aaca8 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,6 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 # this is required for the docs build jobs
-sphinx>=1.8.0,!=2.1.0 # BSD
-openstackdocstheme>=1.31.2 # 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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index ccd313b..6651734 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -49,9 +49,10 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # openstackdocstheme options
-repository_name = 'openstack/openstack-chef'
-bug_project = 'openstack-chef'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/openstack-chef'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'openstack-chef'
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -66,7 +67,7 @@ language = None
 exclude_patterns = ['_build']
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -155,7 +156,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     (master_doc, target_name,
-     title, author, bug_project,
+     title, author, openstackdocs_bug_project,
      description, category),
 ]