diff --git a/salt/kibana/files/config.json b/salt/kibana/etc/config.json
similarity index 100%
rename from salt/kibana/files/config.json
rename to salt/kibana/etc/config.json
diff --git a/salt/kibana/etc/kibana.yml b/salt/kibana/etc/kibana.yml
new file mode 100644
index 000000000..66dc3f412
--- /dev/null
+++ b/salt/kibana/etc/kibana.yml
@@ -0,0 +1,11 @@
+---
+# Default Kibana configuration from kibana-docker.
+
+server.name: kibana
+server.host: "0"
+elasticsearch.url: http://172.17.0.9:9200
+#elasticsearch.username: elastic
+#elasticsearch.password: changeme
+#xpack.monitoring.ui.container.elasticsearch.enabled: true
+elasticsearch.requestTimeout: 90000
+logging.dest: /var/log/kibana/kibana.log
diff --git a/salt/kibana/files/kibana.yml b/salt/kibana/files/kibana.yml
deleted file mode 100644
index b28b761aa..000000000
--- a/salt/kibana/files/kibana.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# 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 a7707a3f5..a77e95fb4 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -18,11 +18,19 @@ kibana:
 
 kibanaconfdir:
   file.directory:
-    - name: /opt/so/conf/kibana
+    - name: /opt/so/conf/kibana/etc
     - user: 932
     - group: 939
     - makedirs: True
 
+synckibanaconfig:
+  file.recurse:
+    - name: /opt/so/conf/kibana/etc
+    - source: salt://kibana/etc
+    - user: 932
+    - group: 939
+    - template: jinja
+
 kibanalogdir:
   file.directory:
     - name: /opt/so/log/kibana
@@ -37,6 +45,15 @@ kibanacustdashdir:
     - group: 939
     - makedirs: True
 
+synckibanacustom:
+  file.recurse:
+    - name: /opt/so/conf/kibana/customdashboards
+    - source: salt://kibana/custom
+    - user: 932
+    - group: 939
+    - template: jinja
+
+
 # File.Recurse for custom saved dashboards
 
 # Start the kibana docker
@@ -51,9 +68,9 @@ so-kibana:
       - ELASTICSEARCH_PORT=9200
       - MASTER={{ master }}
     - binds:
-      - /opt/so/conf/kibana/etc:/usr/share/kibana/config/:ro
+      - /opt/so/conf/kibana/etc:/usr/share/kibana/config:ro
       - /opt/so/log/kibana:/var/log/kibana:rw
-      - /opt/so/conf/kibana/custdashboards/:/usr/share/kibana/custdashboards/:ro
+      - /opt/so/conf/kibana/custdashboards:/usr/share/kibana/custdashboards:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     - port_bindings:
       - 0.0.0.0:5601:5601