diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-dashboard-load
similarity index 100%
rename from salt/kibana/bin/so-kibana-config-load
rename to salt/kibana/bin/so-kibana-dashboard-load
diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja
new file mode 100644
index 000000000..de412770e
--- /dev/null
+++ b/salt/kibana/config.map.jinja
@@ -0,0 +1,9 @@
+{% import_yaml 'kibana/defaults.yaml' as KIBANACONFIG with context %}
+
+{% if salt['pillar.get']('elasticsearch:auth:enabled', False) %}
+  {% do KIBANACONFIG.kibana.config.update({'elasticsearch': {'username': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass')}}) %}
+{% else %}
+  {% do KIBANACONFIG.kibana.config.update({'xpack': {'security': {'authc': {'providers': {'anonymous': {'anonymous1': {'order': 0, 'credentials': 'elasticsearch_anonymous_user'}}}}}}}) %}
+{% endif %}
+
+{% set KIBANACONFIG = salt['pillar.get']('kibana:config', default=KIBANACONFIG.kibana.config, merge=True) %}
diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml
index 59020e125..47db20782 100644
--- a/salt/kibana/defaults.yaml
+++ b/salt/kibana/defaults.yaml
@@ -3,3 +3,31 @@ kibana:
   dashboard:
     discover:
       sampleSize: 100
+  config:
+    server:
+      name: kibana
+      host: 0
+      basePath: /kibana
+      publicBaseUrl: https://{{salt['pillar.get']('global:url_base')}}/kibana
+    elasticsearch:
+      hosts:
+        - https://{{salt['pillar.get']('manager:mainip')}}:9200
+      ssl:
+        verificationMode: none
+      requestTimeout: 90000
+    logging:
+      appenders:
+        file:
+          type: file
+          fileName: /var/log/kibana.log
+          layout:
+            type: pattern
+      root:
+        appenders: 
+          - default
+          - file
+    telemetry:
+        enabled: False
+    security:
+      showInsecureClusterWarning: False
+      
\ No newline at end of file
diff --git a/salt/kibana/etc/kibana.yml.jinja b/salt/kibana/etc/kibana.yml.jinja
new file mode 100644
index 000000000..5e06a53fa
--- /dev/null
+++ b/salt/kibana/etc/kibana.yml.jinja
@@ -0,0 +1 @@
+{{ KIBANACONFIG | yaml(False) }}
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index a23fc68cc..d63eb8f24 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -34,8 +34,8 @@ kibanaconfdir:
 
 synckibanaconfig:
   file.recurse:
-    - name: /opt/so/conf/kibana/etc
-    - source: salt://kibana/etc
+    - name: /opt/so/conf/kibana/etc/kibana.yml
+    - source: salt://kibana/etc/kibana.yml.jinja
     - user: 932
     - group: 939
     - file_mode: 660
@@ -104,9 +104,9 @@ kibanadashtemplate:
     - defaults:
         DASHBOARD: {{ KIBANA_SETTINGS.dashboard }}
 
-so-kibana-config-load:
+so-kibana-dashboard-load:
   cmd.run:
-    - name: /usr/sbin/so-kibana-config-load
+    - name: /usr/sbin/so-kibana-dashboard-load
     - cwd: /opt/so
 
 # Keep the setting correct