diff --git a/salt/common/init.sls b/salt/common/init.sls
index f50f0c61b..8c0089fc0 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -8,6 +8,7 @@ include:
   - common.packages
 {% if GLOBALS.role in GLOBALS.manager_roles %}
   - manager.elasticsearch # needed for elastic_curl_config state
+  - manager.kibana
 {% endif %}
 
 net.core.wmem_default:
diff --git a/salt/kibana/files/curl.config.template b/salt/kibana/files/curl.config.template
new file mode 100644
index 000000000..7ac434017
--- /dev/null
+++ b/salt/kibana/files/curl.config.template
@@ -0,0 +1 @@
+user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user', 'NO_USER_SET') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass', 'NO_PW_SET') }}"
diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index e808325ef..cbe3455fe 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -16,6 +16,7 @@ include:
   - kibana.secrets
   - manager.sync_es_users
   - manager.elasticsearch
+  - manager.kibana
 
 repo_log_dir:
   file.directory:
diff --git a/salt/manager/kibana.sls b/salt/manager/kibana.sls
new file mode 100644
index 000000000..eb2b968d6
--- /dev/null
+++ b/salt/manager/kibana.sls
@@ -0,0 +1,7 @@
+elastic_curl_config_distributed:
+  file.managed:
+    - name: /opt/so/conf/kibana/curl.config
+    - source: salt://kibana/files/curl.config.template
+    - template: jinja
+    - mode: 600
+    - show_changes: False