diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index ab723b063d..4d26f3ad84 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -34,8 +34,7 @@ extensions = [
 
 # openstackdocstheme options
 repository_name = 'openstack/sahara'
-bug_project = '935'
-bug_tag = 'api-ref'
+use_storyboard = True
 
 html_theme = 'openstackdocs'
 html_theme_options = {
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 1a4b967749..9b1ab70dad 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,10 +1,9 @@
 # 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.
-openstackdocstheme>=1.20.0 # Apache-2.0
+openstackdocstheme>=1.31.2 # Apache-2.0
 os-api-ref>=1.6.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
 sphinxcontrib-httpdomain>=1.3.0 # BSD
 whereto>=0.3.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a3dacd6488..a4514055cd 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -41,8 +41,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sp
 
 # openstackdocstheme options
 repository_name = 'openstack/sahara'
-bug_project = '935'
-bug_tag = 'doc'
+use_storyboard = True
 
 config_generator_config_file = 'config-generator.conf'
 config_sample_basename = 'sahara'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 6189e047f9..efc6fc2a52 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -21,8 +21,7 @@ extensions = [
 
 # openstackdocstheme options
 repository_name = 'openstack/sahara'
-bug_project = '935'
-bug_tag = 'releasenotes'
+use_storyboard = True
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/requirements.txt b/requirements.txt
index 09ff14cb8d..e365a79c29 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 alembic>=0.8.10 # MIT
-Babel!=2.4.0,>=2.3.4 # BSD
 botocore>=1.5.1 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
diff --git a/setup.cfg b/setup.cfg
index fc693ff910..43d51a6f8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,7 @@ name = sahara
 summary = Sahara project
 description-file = README.rst
 license = Apache Software License
+python-requires = >=3.6
 classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
@@ -17,9 +18,6 @@ author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/sahara/latest/
 
-[global]
-setup-hooks = pbr.hooks.setup_hook
-
 [files]
 packages =
     sahara
diff --git a/setup.py b/setup.py
index 566d84432e..f63cc23c52 100644
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)