diff --git a/.zuul.yaml b/.zuul.yaml
index 6f5beba6..2f959898 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,7 +17,8 @@
         - airship-promenade-lint-ws
         - airship-promenade-docker-build-gate
         - airship-promenade-doc-build
-        - airship-promenade-lint-chart
+        - airship-promenade-chart-build-gate
+        - airship-promenade-chart-build-latest-htk
         - airship-promenade-unit-py35
 
     gate:
@@ -26,7 +27,7 @@
         - airship-promenade-lint-ws
         - airship-promenade-docker-build-gate
         - airship-promenade-doc-build
-        - airship-promenade-lint-chart
+        - airship-promenade-chart-build-gate
         - airship-promenade-unit-py35
 
     post:
@@ -48,14 +49,23 @@
     nodeset: airship-promenade-single-node
 
 - job:
-    name: airship-promenade-lint-chart
+    name: airship-promenade-chart-build-gate
     description: |
-      Lints Helm charts for validity
+      Lints charts using pinned HTK
     run: tools/zuul/playbooks/helm-linter.yaml
     timeout: 300
     nodeset: airship-promenade-single-node
-    files:
-      - ^charts/.*$
+
+- job:
+    name: airship-promenade-chart-build-latest-htk
+    description: |
+      Lints charts using latest HTK
+    voting: false
+    run: tools/zuul/playbooks/helm-linter.yaml
+    timeout: 300
+    nodeset: airship-promenade-single-node
+    vars:
+      HTK_COMMIT: master
 
 - job:
     name: airship-promenade-unit-py35
diff --git a/tools/zuul/playbooks/helm-linter.yaml b/tools/zuul/playbooks/helm-linter.yaml
index e20f7e05..9e449ac1 100644
--- a/tools/zuul/playbooks/helm-linter.yaml
+++ b/tools/zuul/playbooks/helm-linter.yaml
@@ -13,9 +13,11 @@
 
 - hosts: primary
   tasks:
-    - name: Execute the make target for Helm chart linting
+    - name: Execute the make target to package Helm charts.
       make:
         chdir: "{{ zuul.project.src_dir }}"
-        target: helm-lint
+        target: charts
+        params:
+          HTK_COMMIT: "{{ HTK_COMMIT | default('') }}"
       register: result
       failed_when: result.failed