diff --git a/.zuul.yaml b/.zuul.yaml
index 045d61ad..c4b210c5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,13 +20,15 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - airship-shipyard-linter
-        - airship-shipyard-image
+        - airship-shipyard-chart-build-gate
+        - airship-shipyard-whitespace-lint-gate
+        - airship-shipyard-image-gate
     gate:
       jobs:
         - openstack-tox-pep8
-        - airship-shipyard-linter
-        - airship-shipyard-image
+        - airship-shipyard-chart-build-gate
+        - airship-shipyard-whitespace-lint-gate
+        - airship-shipyard-image-gate
     post:
       jobs:
         - airship-shipyard-docker-build-post
@@ -38,7 +40,15 @@
         label: ubuntu-xenial
 
 - job:
-    name: airship-shipyard-linter
+    name: airship-shipyard-chart-build-gate
+    timeout: 900
+    run: tools/gate/playbooks/build-charts.yaml
+    nodeset: airship-shipyard-single-node
+    files:
+      - ^charts/.*$
+
+- job:
+    name: airship-shipyard-whitespace-lint-gate
     description: |
       Lints all files by checking them for whitespace.
     run: tools/gate/playbooks/zuul-linter.yaml
@@ -57,7 +67,7 @@
       - ^releasenotes/.*$
 
 - job:
-    name: airship-shipyard-image
+    name: airship-shipyard-image-gate
     description: |
       Run shipyard-image build.
     parent: airship-shipyard-image-base
diff --git a/tools/gate/playbooks/build-charts.yaml b/tools/gate/playbooks/build-charts.yaml
new file mode 100644
index 00000000..4e93360a
--- /dev/null
+++ b/tools/gate/playbooks/build-charts.yaml
@@ -0,0 +1,21 @@
+# Copyright 2019, AT&T Intellectual Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- hosts: primary
+  tasks:
+    - name: Build charts
+      shell: |
+        make charts
+      args:
+        chdir: "{{ zuul.project.src_dir }}"