diff --git a/manifests/site.pp b/manifests/site.pp
index 8204295e12..941234ce19 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -133,6 +133,48 @@ node 'jenkins04.openstack.org' {
   }
 }
 
+node 'jenkins05.openstack.org' {
+  class { 'openstack_project::jenkins':
+    jenkins_jobs_password   => hiera('jenkins_jobs_password'),
+    jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
+    ssl_cert_file_contents  => hiera('jenkins05_ssl_cert_file_contents'),
+    ssl_key_file_contents   => hiera('jenkins05_ssl_key_file_contents'),
+    ssl_chain_file_contents => hiera('jenkins05_ssl_chain_file_contents'),
+    sysadmins               => hiera('sysadmins'),
+    zmq_event_receivers     => ['logstash.openstack.org',
+                                'nodepool.openstack.org',
+    ],
+  }
+}
+
+node 'jenkins06.openstack.org' {
+  class { 'openstack_project::jenkins':
+    jenkins_jobs_password   => hiera('jenkins_jobs_password'),
+    jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
+    ssl_cert_file_contents  => hiera('jenkins06_ssl_cert_file_contents'),
+    ssl_key_file_contents   => hiera('jenkins06_ssl_key_file_contents'),
+    ssl_chain_file_contents => hiera('jenkins06_ssl_chain_file_contents'),
+    sysadmins               => hiera('sysadmins'),
+    zmq_event_receivers     => ['logstash.openstack.org',
+                                'nodepool.openstack.org',
+    ],
+  }
+}
+
+node 'jenkins07.openstack.org' {
+  class { 'openstack_project::jenkins':
+    jenkins_jobs_password   => hiera('jenkins_jobs_password'),
+    jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
+    ssl_cert_file_contents  => hiera('jenkins07_ssl_cert_file_contents'),
+    ssl_key_file_contents   => hiera('jenkins07_ssl_key_file_contents'),
+    ssl_chain_file_contents => hiera('jenkins07_ssl_chain_file_contents'),
+    sysadmins               => hiera('sysadmins'),
+    zmq_event_receivers     => ['logstash.openstack.org',
+                                'nodepool.openstack.org',
+    ],
+  }
+}
+
 node 'jenkins-dev.openstack.org' {
   class { 'openstack_project::jenkins_dev':
     jenkins_ssh_private_key  => hiera('jenkins_dev_ssh_private_key_contents'),
@@ -458,6 +500,9 @@ node 'zuul.openstack.org' {
       'jenkins02.openstack.org',
       'jenkins03.openstack.org',
       'jenkins04.openstack.org',
+      'jenkins05.openstack.org',
+      'jenkins06.openstack.org',
+      'jenkins07.openstack.org',
       'jenkins-dev.openstack.org',
     ],
   }
@@ -478,6 +523,9 @@ node 'zuul-dev.openstack.org' {
       'jenkins02.openstack.org',
       'jenkins03.openstack.org',
       'jenkins04.openstack.org',
+      'jenkins05.openstack.org',
+      'jenkins06.openstack.org',
+      'jenkins07.openstack.org',
       'jenkins-dev.openstack.org',
     ],
   }
diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index 49bef4ef31..8fd18cf352 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -7,6 +7,9 @@ zmq-publishers:
   - tcp://jenkins02.openstack.org:8888
   - tcp://jenkins03.openstack.org:8888
   - tcp://jenkins04.openstack.org:8888
+  - tcp://jenkins05.openstack.org:8888
+  - tcp://jenkins06.openstack.org:8888
+  - tcp://jenkins07.openstack.org:8888
 
 # List of files to source logs from.
 source-files:
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 9ee3f7db8a..473865dc8e 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -78,6 +78,9 @@ class openstack_project::cacti (
     'jenkins02.openstack.org',
     'jenkins03.openstack.org',
     'jenkins04.openstack.org',
+    'jenkins05.openstack.org',
+    'jenkins06.openstack.org',
+    'jenkins07.openstack.org',
     'jenkins-dev.openstack.org',
     'lists.openstack.org',
     'logstash.openstack.org',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index 1c07c23ab0..c928c443c2 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -11,6 +11,9 @@ zmq-publishers:
   - tcp://jenkins02.openstack.org:8888
   - tcp://jenkins03.openstack.org:8888
   - tcp://jenkins04.openstack.org:8888
+  - tcp://jenkins05.openstack.org:8888
+  - tcp://jenkins06.openstack.org:8888
+  - tcp://jenkins07.openstack.org:8888
 
 gearman-servers:
   - host: zuul.openstack.org