diff --git a/hiera/common.yaml b/hiera/common.yaml
index e294935667..04b8c4221a 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -1,11 +1,4 @@
 ---
-elasticsearch_nodes:
-- elasticsearch02.openstack.org
-- elasticsearch03.openstack.org
-- elasticsearch04.openstack.org
-- elasticsearch05.openstack.org
-- elasticsearch06.openstack.org
-- elasticsearch07.openstack.org
 infra_apache_serveradmin: noc@openstack.org
 statusbot_channels:
 - airshipit
diff --git a/manifests/site.pp b/manifests/site.pp
index a7e3c61575..1b1c10a047 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -5,7 +5,17 @@
 # in between any two variables in order for them to be correctly parsed and
 # passed around in test.sh
 #
-$elasticsearch_nodes = hiera_array('elasticsearch_nodes')
+# Note we do not do a hiera lookup here as we set $group on a per node basis
+# and that must be set before we can do hiera lookups. Doing a hiera lookup
+# here would fail to find any group specific info.
+$elasticsearch_nodes = [
+  "elasticsearch02.openstack.org",
+  "elasticsearch03.openstack.org",
+  "elasticsearch04.openstack.org",
+  "elasticsearch05.openstack.org",
+  "elasticsearch06.openstack.org",
+  "elasticsearch07.openstack.org",
+]
 
 #
 # Default: should at least behave like an openstack server