diff --git a/hiera/common.yaml b/hiera/common.yaml
index badd4782ab..91a11b2820 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -23,11 +23,6 @@ elasticsearch_clients:
 - logstash-worker13.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
 - subunit-worker01.openstack.org
 - subunit-worker02.openstack.org
 - ze01.openstack.org
@@ -425,11 +420,6 @@ cacti_hosts:
 - logstash-worker13.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
 - logstash.openstack.org
 - nb01.openstack.org
 - nb02.openstack.org