diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index a193d07443..26b13b88dd 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -128,8 +128,8 @@ class openstack_project::gerrit (
     commentlinks                    => [
       {
         name  => 'changeid',
-        match => '(I?[0-9a-f]{8,40})',
-        link  => '#q,$1,n,z',
+        match => '(<p>|[\\s]+)(I?[0-9a-f]{7,40})(</p>|[\\s.]+)',
+        html  => '$1<a href=\"#q,$2,n,z\">$2</a>$3',
       },
       {
         name  => 'bugheader',