diff --git a/gerrit/acls/openstack-infra/puppet-openstack-health.config b/gerrit/acls/openstack-infra/puppet-openstack-health.config
new file mode 100644
index 0000000000..fc99501315
--- /dev/null
+++ b/gerrit/acls/openstack-infra/puppet-openstack-health.config
@@ -0,0 +1,13 @@
+[access "refs/heads/*"]
+abandon = group puppet-openstack-health-core
+label-Code-Review = -2..+2 group puppet-openstack-health-core
+label-Workflow = -1..+1 group puppet-openstack-health-core
+
+[access "refs/tags/*"]
+pushSignedTag = group puppet-openstack-health-release
+
+[receive]
+requireChangeId = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index b2ba15967a..79d8227c93 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -462,6 +462,11 @@
   description: Puppet module for OpenAFS
   groups:
     - openstack-ci
+- project: openstack-infra/puppet-openstack-health
+  use-storyboard: true
+  description: Puppet module to deploy OpenStack Health
+  groups:
+    - openstack-ci
 - project: openstack-infra/puppet-openstackci
   use-storyboard: true
   description: Puppet module to deploy an OpenStack ci system
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 019a1b5923..062f7157fd 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -659,6 +659,7 @@ openstack-infra:
       - openstack-infra/puppet-nodepool
       - openstack-infra/puppet-odsreg
       - openstack-infra/puppet-openafs
+      - openstack-infra/puppet-openstack-health
       - openstack-infra/puppet-openstackci
       - openstack-infra/puppet-openstackid
       - openstack-infra/puppet-os_client_config
@@ -964,6 +965,7 @@ openstack-merges:
       - openstack-infra/puppet-nodepool
       - openstack-infra/puppet-odsreg
       - openstack-infra/puppet-openafs
+      - openstack-infra/puppet-openstack-health
       - openstack-infra/puppet-openstackci
       - openstack-infra/puppet-openstackid
       - openstack-infra/puppet-os_client_config
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 7853c1e105..d4265303e9 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4368,6 +4368,17 @@
           branch-designator: '-nv'
           branch-override: default
 
+- project:
+    name: puppet-openstack-health
+    node: 'bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+      - puppet-beaker-jobs:
+          branch-designator: '-nv'
+          branch-override: default
+
 - project:
     name: puppet-openstackci
     node: 'bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fb24e3881d..1c08262b21 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6368,6 +6368,13 @@ projects:
       - name: infra-puppet-apply-jobs
       - name: puppet-beaker-jobs-nv
 
+  - name: openstack-infra/puppet-openstack-health
+    template:
+      - name: merge-check
+      - name: infra-puppet-check-jobs
+      - name: infra-puppet-apply-jobs
+      - name: puppet-beaker-jobs-nv
+
   - name: openstack-infra/puppet-openstackci
     template:
       - name: merge-check