diff --git a/.zuul.yaml b/.zuul.yaml
index c4b210c5..b8f7c636 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,6 +21,7 @@
       jobs:
         - openstack-tox-pep8
         - airship-shipyard-chart-build-gate
+        - airship-shipyard-chart-build-latest-htk
         - airship-shipyard-whitespace-lint-gate
         - airship-shipyard-image-gate
     gate:
@@ -41,11 +42,20 @@
 
 - job:
     name: airship-shipyard-chart-build-gate
+    description: Build charts using pinned Helm toolkit.
     timeout: 900
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: airship-shipyard-single-node
-    files:
-      - ^charts/.*$
+
+- job:
+    name: airship-shipyard-chart-build-latest-htk
+    description: Build charts using latest Helm toolkit.
+    timeout: 900
+    voting: false
+    run: tools/gate/playbooks/build-charts.yaml
+    nodeset: airship-shipyard-single-node
+    vars:
+      HTK_COMMIT: master
 
 - job:
     name: airship-shipyard-whitespace-lint-gate
diff --git a/tools/gate/playbooks/build-charts.yaml b/tools/gate/playbooks/build-charts.yaml
index 4e93360a..8807e4a0 100644
--- a/tools/gate/playbooks/build-charts.yaml
+++ b/tools/gate/playbooks/build-charts.yaml
@@ -14,8 +14,11 @@
 
 - hosts: primary
   tasks:
-    - name: Build charts
-      shell: |
-        make charts
-      args:
+    - name: Execute the make target to package Helm charts.
+      make:
         chdir: "{{ zuul.project.src_dir }}"
+        target: charts
+        params:
+          HTK_COMMIT: "{{ HTK_COMMIT | default('') }}"
+      register: result
+      failed_when: result.failed