diff --git a/doc/arch-design/source/conf.py b/doc/arch-design/source/conf.py
index 2a6981f0fc..9b8f3abb36 100644
--- a/doc/arch-design/source/conf.py
+++ b/doc/arch-design/source/conf.py
@@ -54,7 +54,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Architecture Design Guide'
-bug_tag = u'arch-design-rst'
+bug_tag = u'arch-design'
 copyright = u'2015-2016, OpenStack contributors'
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/doc/cli-ref-rst/source/conf.py b/doc/cli-ref-rst/source/conf.py
index 79936b83bd..412ab45ae6 100644
--- a/doc/cli-ref-rst/source/conf.py
+++ b/doc/cli-ref-rst/source/conf.py
@@ -56,7 +56,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Command-Line Interface Reference'
-bug_tag = u'cli-ref-rst'
+bug_tag = u'cli-reference'
 copyright = u'2015-2016, OpenStack contributors'
 
 # The version info for the project you're documenting, acts as replacement for