diff --git a/.zuul.yaml b/.zuul.yaml
index 492effe2..3ea8e40c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,10 +21,12 @@
     check:
       jobs:
         - openstack-tox-pep8
+        - airship-armada-chart-build-gate
         - airship-armada-docker-build-gate
     gate:
       jobs:
         - openstack-tox-pep8
+        - airship-armada-chart-build-gate
         - airship-armada-docker-build-gate
     post:
       jobs:
@@ -36,6 +38,14 @@
       - name: primary
         label: ubuntu-xenial
 
+- job:
+    name: airship-armada-chart-build-gate
+    timeout: 900
+    run: tools/gate/playbooks/build-charts.yaml
+    nodeset: airship-armada-single-node
+    files:
+      - ^charts/.*$
+
 - job:
     name: airship-armada-docker-build-gate
     timeout: 1800
diff --git a/charts/armada/Chart.yaml b/charts/armada/Chart.yaml
index 8a663efa..ace4db31 100644
--- a/charts/armada/Chart.yaml
+++ b/charts/armada/Chart.yaml
@@ -18,7 +18,7 @@ name: armada
 version: 0.1.0
 keywords:
 - armada
-home: https://airship-armada.readthedocs.io/
+home: https://airship-armada.readthedocs.io
 sources:
 - https://github.com/openstack/airship-armada
 engine: gotpl
diff --git a/charts/tiller/Chart.yaml b/charts/tiller/Chart.yaml
index bef35d24..f087d35f 100644
--- a/charts/tiller/Chart.yaml
+++ b/charts/tiller/Chart.yaml
@@ -18,7 +18,7 @@ name: tiller
 version: 0.1.0
 keywords:
 - tiller
-home: https://docs.helm.sh/
+home: https://docs.helm.sh
 sources:
 - https://github.com/kubernetes/helm
 engine: gotpl
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 }}"