diff --git a/doc/source/conf.py b/doc/source/conf.py
index b13b4153..7896ac5e 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -46,8 +46,7 @@ copyright = u'2013, OpenStack Foundation'
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/cyborg'
 openstackdocs_pdf_link = True
-openstackdocs_bug_project = 'cyborg'
-openstackdocs_bug_tag = ''
+openstackdocs_use_storyboard = True
 
 config_generator_config_file = '../../tools/config/cyborg-config-generator.conf'
 sample_config_basename = '_static/cyborg'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index f7000797..85fe66ee 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -16,8 +16,7 @@ extensions = [
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/cyborg'
-openstackdocs_bug_project = 'openstack-cyborg'
-openstackdocs_bug_tag = ''
+openstackdocs_use_storyboard = True
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string: