diff --git a/manifests/site.pp b/manifests/site.pp
index 400a69bc3c..3e0eabace7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -331,18 +331,18 @@ node 'puppet-dashboard.openstack.org' {
 }
 
 $elasticsearch_nodes = [
-  'elasticsearch.openstack.org',
-  'elasticsearch2.openstack.org',
-  'elasticsearch3.openstack.org',
-  'elasticsearch4.openstack.org',
-  'elasticsearch5.openstack.org',
-  'elasticsearch6.openstack.org',
   'elasticsearch01.openstack.org',
   'elasticsearch02.openstack.org',
   'elasticsearch03.openstack.org',
   'elasticsearch04.openstack.org',
   'elasticsearch05.openstack.org',
   'elasticsearch06.openstack.org',
+  'elasticsearch.openstack.org',
+  'elasticsearch2.openstack.org',
+  'elasticsearch3.openstack.org',
+  'elasticsearch4.openstack.org',
+  'elasticsearch5.openstack.org',
+  'elasticsearch6.openstack.org',
 ]
 
 node 'logstash.openstack.org' {
@@ -382,7 +382,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
   class { 'openstack_project::logstash_worker':
     sysadmins           => hiera('sysadmins'),
     elasticsearch_nodes => $elasticsearch_nodes,
-    discover_node       => 'elasticsearch.openstack.org',
+    discover_node       => 'elasticsearch01.openstack.org',
   }
 }
 
diff --git a/modules/openstack_project/manifests/logstash.pp b/modules/openstack_project/manifests/logstash.pp
index 372034fa26..aded079b20 100644
--- a/modules/openstack_project/manifests/logstash.pp
+++ b/modules/openstack_project/manifests/logstash.pp
@@ -17,7 +17,7 @@
 class openstack_project::logstash (
   $elasticsearch_nodes = [],
   $gearman_workers = [],
-  $discover_nodes = ['elasticsearch.openstack.org:9200'],
+  $discover_nodes = ['elasticsearch01.openstack.org:9200'],
   $statsd_host = 'graphite.openstack.org',
   $sysadmins = []
 ) {
diff --git a/modules/openstack_project/manifests/logstash_worker.pp b/modules/openstack_project/manifests/logstash_worker.pp
index f3864b79af..f79d8ff6dc 100644
--- a/modules/openstack_project/manifests/logstash_worker.pp
+++ b/modules/openstack_project/manifests/logstash_worker.pp
@@ -16,7 +16,7 @@
 #
 class openstack_project::logstash_worker (
   $elasticsearch_nodes = [],
-  $discover_node = 'elasticsearch.openstack.org',
+  $discover_node = 'elasticsearch01.openstack.org',
   $sysadmins = []
 ) {
   $iptables_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')