diff --git a/salt/kibana/files/kibana.yml b/salt/kibana/files/kibana.yml
new file mode 100644
index 000000000..b28b761aa
--- /dev/null
+++ b/salt/kibana/files/kibana.yml
@@ -0,0 +1,9 @@
+---
+# Default Kibana configuration from kibana-docker.
+
+server.name: kibana
+server.host: "0"
+elasticsearch.url: http://elasticsearch:9200
+elasticsearch.username: elastic
+elasticsearch.password: changeme
+xpack.monitoring.ui.container.elasticsearch.enabled: true
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index c460cb183..216219a9e 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -47,12 +47,13 @@ so-kibana:
     - user: kibana
     - environment:
       - KIBANA_DEFAULTAPPID=dashboard/94b52620-342a-11e7-9d52-4f090484f59e
-      - ELASTICSEARCH_HOST={{ grains.host }}
+      - ELASTICSEARCH_HOST=elasticsearch
       - 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
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     - network_mode: so-elastic-net
     - port_bindings:
       - 127.0.0.1:5601:5601
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 5c5e7d98b..ac3a8adea 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -164,4 +164,5 @@ so-logstash:
       - /nsm/import:/nsm/import:ro
       - /nsm/logstash:/usr/share/logstash/data:rw
       - /opt/so/log/logstash:/var/log/logstash:rw
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     - network_mode: so-elastic-net