diff --git a/ciwatch/events.py b/ciwatch/events.py
index 0bc8fda..19253e7 100644
--- a/ciwatch/events.py
+++ b/ciwatch/events.py
@@ -27,7 +27,7 @@ pipeline_pattern = re.compile("\((.*)\spipeline\)")
 possible_results = "FAILURE|SUCCESS|NOT_REGISTERED|UNSTABLE"
 comment_pattern = re.compile("[-*]\s+([^\s*]+)\s+(http[^\s*]+) : (%s)" %
                              possible_results)
-trusted_author_names = ["Jenkins check"]
+trusted_author_names = ["Jenkins check", "Zuul check"]
 
 
 def _process_project_name(project_name):
@@ -60,7 +60,7 @@ def _process_event(event):
 
 
 def _is_ci_user(name):
-    ci_keywords = ['CI', 'Jenkins', 'Bot']
+    ci_keywords = ['CI', 'Jenkins', 'Bot', 'Zuul']
     return any(word in name for word in ci_keywords)
 
 
diff --git a/ciwatch/models.py b/ciwatch/models.py
index 4787a81..71b73fe 100644
--- a/ciwatch/models.py
+++ b/ciwatch/models.py
@@ -77,7 +77,7 @@ class CiServer(Base):
     id = Column(Integer, primary_key=True)
     name = Column(String(128))
 
-    # Official OpenStack CIs are trusted (e.g., Jenkins)
+    # Official OpenStack CIs are trusted
     trusted = Column(Boolean, default=False)
 
     ci_owner_id = Column(Integer, ForeignKey('ci_owners.id'))
diff --git a/ciwatch/templates/project.html.jinja b/ciwatch/templates/project.html.jinja
index 919cb28..b12f189 100644
--- a/ciwatch/templates/project.html.jinja
+++ b/ciwatch/templates/project.html.jinja
@@ -38,8 +38,8 @@
         </ul>
       </div>
 
-      <button id="verified-1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Jenkins -1 votes</button>
-      <button id="verified1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Jenkins +1 votes</button>
+      <button id="verified-1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Trusted -1 votes</button>
+      <button id="verified1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Trusted +1 votes</button>
       <button id="select-button" class="btn btn-default" type="button" data-toggle="button">Select</button>
     </div>