diff --git a/modules/jenkins_jobs/manifests/jobs/merge_gate.pp b/modules/jenkins_jobs/manifests/jobs/merge_gate.pp
index 1e195350e2..72356d01e6 100644
--- a/modules/jenkins_jobs/manifests/jobs/merge_gate.pp
+++ b/modules/jenkins_jobs/manifests/jobs/merge_gate.pp
@@ -5,7 +5,7 @@ define jenkins_jobs::jobs::merge_gate($site, $project, $node_group, $trigger_bra
     project => $project,
     job => "merge",
     node_group => $node_group,
-    triggers => trigger("gerrit_comment"),
+    triggers => trigger("gerrit_comment_merge"),
     builders => builder("gerrit_git_prep"),
     trigger_branches => $trigger_branches,
     auth_build => true
diff --git a/modules/jenkins_jobs/manifests/jobs/pep8_gate.pp b/modules/jenkins_jobs/manifests/jobs/pep8_gate.pp
index fcfba45757..ffd3bf7d72 100644
--- a/modules/jenkins_jobs/manifests/jobs/pep8_gate.pp
+++ b/modules/jenkins_jobs/manifests/jobs/pep8_gate.pp
@@ -5,7 +5,7 @@ define jenkins_jobs::jobs::pep8_gate($site, $project, $node_group, $trigger_bran
     project => $project,
     job => "pep8",
     node_group => $node_group,
-    triggers => trigger("gerrit_comment"),
+    triggers => trigger("gerrit_comment_plain"),
     builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("pep8")],
     publishers => publisher("pep8"),
     trigger_branches => $trigger_branches,
diff --git a/modules/jenkins_jobs/manifests/jobs/python26_gate.pp b/modules/jenkins_jobs/manifests/jobs/python26_gate.pp
index 7a3dedae1b..fa4f0de3e3 100644
--- a/modules/jenkins_jobs/manifests/jobs/python26_gate.pp
+++ b/modules/jenkins_jobs/manifests/jobs/python26_gate.pp
@@ -5,7 +5,7 @@ define jenkins_jobs::jobs::python26_gate($site, $project, $node_group, $trigger_
     project => $project,
     job => "python26",
     node_group => $node_group,
-    triggers => trigger("gerrit_comment"),
+    triggers => trigger("gerrit_comment_plain"),
     builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("python26")],
     trigger_branches => $trigger_branches,
     auth_build => true
diff --git a/modules/jenkins_jobs/manifests/jobs/python27_gate.pp b/modules/jenkins_jobs/manifests/jobs/python27_gate.pp
index 16c32727ef..0e519700ea 100644
--- a/modules/jenkins_jobs/manifests/jobs/python27_gate.pp
+++ b/modules/jenkins_jobs/manifests/jobs/python27_gate.pp
@@ -5,7 +5,7 @@ define jenkins_jobs::jobs::python27_gate($site, $project, $node_group, $trigger_
     project => $project,
     job => "python27",
     node_group => $node_group,
-    triggers => trigger("gerrit_comment"),
+    triggers => trigger("gerrit_comment_plain"),
     builders => [builder("gerrit_git_prep"), builder("copy_bundle"), builder("python27")],
     trigger_branches => $trigger_branches,
     auth_build => true
diff --git a/modules/jenkins_jobs/templates/trigger_gerrit_comment.xml.erb b/modules/jenkins_jobs/templates/trigger_gerrit_comment_merge.xml.erb
similarity index 100%
rename from modules/jenkins_jobs/templates/trigger_gerrit_comment.xml.erb
rename to modules/jenkins_jobs/templates/trigger_gerrit_comment_merge.xml.erb
diff --git a/modules/jenkins_jobs/templates/trigger_gerrit_comment_plain.xml.erb b/modules/jenkins_jobs/templates/trigger_gerrit_comment_plain.xml.erb
new file mode 100644
index 0000000000..b30c2ccdc2
--- /dev/null
+++ b/modules/jenkins_jobs/templates/trigger_gerrit_comment_plain.xml.erb
@@ -0,0 +1,30 @@
+    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+      <spec></spec>
+      <gerritProjects>
+        <% trigger_branches.each do |trigger| %>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+          <compareType>PLAIN</compareType>
+          <pattern><%= site %>/<%= trigger[0] %></pattern>
+          <branches>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>ANT</compareType>
+              <pattern><%= trigger[1] %></pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+          </branches>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+        <% end %>
+      </gerritProjects>
+      <silentMode>false</silentMode>
+      <escapeQuotes>true</escapeQuotes>
+      <triggerOnPatchsetUploadedEvent>false</triggerOnPatchsetUploadedEvent>
+      <triggerOnChangeMergedEvent>false</triggerOnChangeMergedEvent>
+      <triggerOnCommentAddedEvent>true</triggerOnCommentAddedEvent>
+      <triggerOnRefUpdatedEvent>false</triggerOnRefUpdatedEvent>
+      <commentAddedTriggerApprovalCategory>APRV</commentAddedTriggerApprovalCategory>
+      <commentAddedTriggerApprovalValue>1</commentAddedTriggerApprovalValue>
+      <buildStartMessage></buildStartMessage>
+      <buildFailureMessage></buildFailureMessage>
+      <buildSuccessfulMessage></buildSuccessfulMessage>
+      <buildUnstableMessage></buildUnstableMessage>
+      <customUrl></customUrl>
+    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>