diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst
index e3b6bb14..46c80d58 100644
--- a/doc/source/contributor/contributing.rst
+++ b/doc/source/contributor/contributing.rst
@@ -22,18 +22,18 @@ Please refer the `python-heatclient Core Team
 
 New Feature Planning
 ~~~~~~~~~~~~~~~~~~~~
-python-heatclient features are tracked on `Storyboard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+python-heatclient features are tracked on `Storyboard <https://storyboard.openstack.org/#!/project/openstack/python-heatclient>`_.
 Please specify the reported story with `python-heatclient`.
 
 Task Tracking
 ~~~~~~~~~~~~~
-We track our tasks in `Storyboard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+We track our tasks in `Storyboard <https://storyboard.openstack.org/#!/project/openstack/python-heatclient>`_.
 Please specify the reported story with `python-heatclient`.
 
 Reporting a Bug
 ~~~~~~~~~~~~~~~
 You found an issue and want to make sure we are aware of it? You can do so on
-`Storyboard <https://storyboard.openstack.org/#!/project/openstack/heat>`_.
+`Storyboard <https://storyboard.openstack.org/#!/project/openstack/python-heatclient>`_.
 Please specify the reported story with `python-heatclient`.
 
 Getting Your Patch Merged
diff --git a/doc/source/man/heat.rst b/doc/source/man/heat.rst
index 1d215968..d181b39e 100644
--- a/doc/source/man/heat.rst
+++ b/doc/source/man/heat.rst
@@ -95,4 +95,5 @@ Please ask your OpenStack operator to enable this feature.
 BUGS
 ====
 
-Heat client is hosted in Launchpad so you can view current bugs at https://storyboard.openstack.org/#!/project/openstack/python-heatclient.
+Heat client bugs are managed throught StoryBoard
+`OpenStack Heat Client Stories <https://storyboard.openstack.org/#!/project/openstack/python-heatclient>`__