diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index c0301b8756..19a4d4f61d 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -280,6 +280,12 @@
   groups:
     - openstack-ci
   upstream: git://github.com/dprince/puppet-yum.git
+- project: openstack-infra/puppet-zanata
+  use-storyboard: true
+  description: Puppet module to deploy Zanata
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-zuul
   use-storyboard: true
   acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 99f9651c48..c5d8fcccbe 100644
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -43,6 +43,7 @@ openstack-infra:
       - openstack-infra/puppet-vcsrepo
       - openstack-infra/puppet-vinz
       - openstack-infra/puppet-yum
+      - openstack-infra/puppet-zanata
       - openstack-infra/puppet-zuul
       - openstack-infra/pypi-mirror
       - openstack-infra/python-storyboardclient
@@ -823,6 +824,7 @@ openstack-merges:
       - openstack-infra/puppet-storyboard
       - openstack-infra/puppet-vcsrepo
       - openstack-infra/puppet-yum
+      - openstack-infra/puppet-zanata
       - openstack-infra/puppet-zuul
       - openstack-infra/pypi-mirror
       - openstack-infra/python-storyboardclient
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 45fe575b96..18f6c78598 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2037,6 +2037,14 @@
       - gate-{name}-puppet-beaker-rspec
       - '{name}-forge-upload'
 
+- project:
+    name: puppet-zanata
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+
 - project:
     name: pypi-mirror
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 30989a0078..e22f11954c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3417,6 +3417,11 @@ projects:
       - gate-system-config-puppet-lint
       - gate-system-config-puppet-syntax
 
+  - name: openstack-infra/puppet-zanata
+    template:
+      - name: merge-check
+      - name: puppet-check-jobs
+
   - name: openstack-infra/puppet-zuul
     template:
       - name: merge-check