diff --git a/modules/openstack_project/files/git/commit-filter.sh b/modules/openstack_project/files/git/commit-filter.sh
index d780d6738a..1654f24dbf 100644
--- a/modules/openstack_project/files/git/commit-filter.sh
+++ b/modules/openstack_project/files/git/commit-filter.sh
@@ -4,5 +4,6 @@ sed -re '
 s`(I[0-9a-f]{8,40})`<a href="https://review.openstack.org/\#q,\1,n,z">\0</a>`g
 s`\b([0-9a-fA-F]{8,40})\b`<a href="./?id=\1">\0</a>`g
 s`(\b[Bb]ug\b|\b[Ll][Pp]\b)[ \t#:]*([0-9]+)`<a href="https://code.launchpad.net/bugs/\2">\0</a>`g
+s`(\b[Ss]tory\b)[ \t#:]*([0-9]+)`<a href="https://storyboard.openstack.org/#!/story/\2">\0</a>`g
 s`(\b[Bb]lue[Pp]rint\b|\b[Bb][Pp]\b)[ \t#:]*([A-Za-z0-9\.-]+)`<a href="https://blueprints.launchpad.net/openstack/?searchtext=\2">\0</a>`g
 '
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 9cee29dced..748e283857 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -144,6 +144,11 @@ class openstack_project::gerrit (
         match => '\\bbug:? #?(\\d+)',
         link  => 'https://launchpad.net/bugs/$1',
       },
+      {
+        name  => 'story',
+        match => '\\bstory:? #?(\\d+)',
+        link  => 'https://storyboard.openstack.org/#!/story/$1',
+      },
       {
         name  => 'blueprint',
         match => '(\\b[Bb]lue[Pp]rint\\b|\\b[Bb][Pp]\\b)[ \\t#:]*([A-Za-z0-9\\-]+)',