diff --git a/gerrit/acls/openstack-infra/puppet-openstack-health.config b/gerrit/acls/openstack-infra/puppet-openstack-health.config
deleted file mode 100644
index fc99501315..0000000000
--- a/gerrit/acls/openstack-infra/puppet-openstack-health.config
+++ /dev/null
@@ -1,13 +0,0 @@
-[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/acls/openstack-infra/puppet-openstack_health.config b/gerrit/acls/openstack-infra/puppet-openstack_health.config
new file mode 100644
index 0000000000..661730ae44
--- /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 936fb1824c..363f98f8b1 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -485,11 +485,6 @@
   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
@@ -500,6 +495,11 @@
   description: Puppet module to deploy openstackid
   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-os_client_config
   use-storyboard: true
   description: Puppet module for os-client-config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 4fc321bd53..8797069293 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -696,7 +696,7 @@ openstack-infra:
     - openstack-infra/puppet-nodepool
     - openstack-infra/puppet-odsreg
     - openstack-infra/puppet-openafs
-    - openstack-infra/puppet-openstack-health
+    - openstack-infra/puppet-openstack_health
     - openstack-infra/puppet-openstackci
     - openstack-infra/puppet-openstackid
     - openstack-infra/puppet-os_client_config
@@ -948,7 +948,7 @@ openstack-merges:
     - openstack-infra/puppet-nodepool
     - openstack-infra/puppet-odsreg
     - openstack-infra/puppet-openafs
-    - openstack-infra/puppet-openstack-health
+    - 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 6e0509836b..63e1cd01ab 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4694,7 +4694,7 @@
           branch-override: default
 
 - project:
-    name: puppet-openstack-health
+    name: puppet-openstack_health
     node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 80b9cc017d..e1953d6cb5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3003,7 +3003,7 @@ projects:
       - name: infra-puppet-apply-jobs
       - name: puppet-beaker-jobs-nv
 
-  - name: openstack-infra/puppet-openstack-health
+  - name: openstack-infra/puppet-openstack_health
     template:
       - name: merge-check
       - name: infra-puppet-check-jobs