diff --git a/pillar/masters/example.sls b/pillar/masters/example.sls
index b4895bf05..c17933408 100644
--- a/pillar/masters/example.sls
+++ b/pillar/masters/example.sls
@@ -1,5 +1,5 @@
 # Example Pillar file for a master
 master:
-  esaccessip: CHANGEME
+  esaccessip: 127.0.0.1
   esheap: CHANGEME
-  esclustername: CHANGEME
+  esclustername: {{ grains.host }}
diff --git a/salt/elastic/init.sls b/salt/elastic/init.sls
index fbbab9445..291238d52 100644
--- a/salt/elastic/init.sls
+++ b/salt/elastic/init.sls
@@ -2,9 +2,16 @@
 {% set esheap = salt['pillar.get'](master:esheap) %}
 {% set esaccessip = salt['pillar.get'](master:esaccessip) %}
 
+# Add ES user
+elasticsearch:
+  user.present:
+    - uid: 930
+    - gid: 930
+    - home: /opt/so/conf/elasticsearch
+
 so-elasticsearch:
   dockerng.running:
-    - image: pillaritem/so-logstash
+    - image: pillaritem/so-elasticsearch
     - hostname: elasticsearch
     - user: elasticsearch
     - environment: