diff --git a/playbooks/roles/gerrit/templates/gerrit.config.j2 b/playbooks/roles/gerrit/templates/gerrit.config.j2
index bd311ad57b..e3a53216bd 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config.j2
+++ b/playbooks/roles/gerrit/templates/gerrit.config.j2
@@ -99,35 +99,30 @@
 [commentlink "bugheader"]
 	match = "([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)"
 	link = https://launchpad.net/bugs/$2
-	html =
 [commentlink "bug"]
 	match = "\\b[Bb]ug:? #?(\\d+)"
 	link = https://launchpad.net/bugs/$1
-	html =
 [commentlink "story"]
 	match = "\\b[Ss]tory:? #?(\\d+)"
 	link = "{{ gerrit_storyboard_url }}/#!/story/$1"
-	html =
 [commentlink "task"]
 	match = "\\b[Tt]ask:? #?(\\d+)"
 	link = "{{ gerrit_storyboard_url }}/#!/task/$1"
-	html =
 [commentlink "its-storyboard"]
 	match = "\\b[Tt]ask:? #?(\\d+)"
 	link = task: $1
-	html =
 [commentlink "blueprint"]
 	match = "(\\b[Bb]lue[Pp]rint\\b|\\b[Bb][Pp]\\b)[ \\t#:]*([A-Za-z0-9\\-]+)"
 	link = https://blueprints.launchpad.net/openstack/?searchtext=$2
-	html =
 [commentlink "changeid"]
 	match = (I[0-9a-f]{8,40})
 	link = "/#/q/$1"
-	html =
 [commentlink "gitsha"]
 	match = "(<p>|[\\s(])([0-9a-f]{40})(</p>|[\\s.,;:)])"
-	link =
-	html = "$1<a href=\"/#/q/$2\">$2</a>$3"
+	link = "/#/q/$2"
+	prefix = $1
+	text = $2
+	suffix = $3
 [its-storyboard]
 	url = {{ gerrit_storyboard_url }}
 [trackingid "launchpad-bug"]