diff --git a/manifests/site.pp b/manifests/site.pp
index 43143f79f5..9e12497de8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -274,6 +274,10 @@ node 'logstash.openstack.org' {
       'logstash-worker14.openstack.org',
       'logstash-worker15.openstack.org',
       'logstash-worker16.openstack.org',
+      'logstash-worker17.openstack.org',
+      'logstash-worker18.openstack.org',
+      'logstash-worker19.openstack.org',
+      'logstash-worker20.openstack.org',
     ],
     discover_nodes                  => [
       'elasticsearch01.openstack.org:9200',
@@ -316,6 +320,10 @@ node /^elasticsearch\d+\.openstack\.org$/ {
       'logstash-worker14.openstack.org',
       'logstash-worker15.openstack.org',
       'logstash-worker16.openstack.org',
+      'logstash-worker17.openstack.org',
+      'logstash-worker18.openstack.org',
+      'logstash-worker19.openstack.org',
+      'logstash-worker20.openstack.org',
     ],
     discover_nodes        => $elasticsearch_nodes,
   }
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 4bd6d17523..532ab07443 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -114,6 +114,10 @@ class openstack_project::cacti (
     'logstash-worker14.openstack.org',
     'logstash-worker15.openstack.org',
     'logstash-worker16.openstack.org',
+    'logstash-worker17.openstack.org',
+    'logstash-worker18.openstack.org',
+    'logstash-worker19.openstack.org',
+    'logstash-worker20.openstack.org',
     'nodepool.openstack.org',
     'paste.openstack.org',
     'pbx.openstack.org',