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 9d0afb175e..5cb68dfe75 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 2eddf65d35..d0390c7d5c 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -671,6 +671,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
@@ -976,6 +977,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 ccc9d97d22..62e9cbea2e 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4388,6 +4388,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 4d94f4122e..baaae0ecde 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6397,6 +6397,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