diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index d1415f1bd..82b0e055c 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -1,11 +1,13 @@
+
+
 # Add ES Group
 kibanasearchgroup:
   group.present:
-    - name: elasticsearch
+    - name: kibana
     - gid: 932
 
 # Add ES user
-kibanasearch:
+kibana:
   user.present:
     - uid: 932
     - gid: 932
@@ -28,13 +30,15 @@ kibanalogdir:
     - group: 939
     - makedirs: True
 
-kibanalogdir:
+kibanacustdashdir:
   file.directory:
     - name: /opt/so/conf/kibana/customdashboards
     - user: 932
     - group: 939
     - makedirs: True
 
+# File.Recurse for custom saved dashboards
+
 # Start the kibana docker
 so-kibana:
   docker_container.running:
@@ -43,9 +47,12 @@ so-kibana:
     - user: kibana
     - environment:
       - KIBANA_DEFAULTAPPID=$KIBANA_DEFAULTAPPID
+      - ELASTICSEARCH_HOST={{ grains.host }}
+      - ELASTICSEARCH_PORT=9200
     - binds:
       - /opt/so/conf/kibana/:/usr/share/kibana/config/:ro
       - /opt/so/log/kibana:/var/log/kibana:rw
+      - /opt/so/conf/kibana/custdashboards/:/usr/share/kibana/custdashboards/:ro
     - network_mode: so-elastic-net
     - port_bindings:
       - 127.0.01:5601:5601