diff --git a/kibana/client/init.sls b/kibana/client/init.sls
index ee315f9..d0c38e7 100644
--- a/kibana/client/init.sls
+++ b/kibana/client/init.sls
@@ -1,9 +1,6 @@
 {%- from "kibana/map.jinja" import client with context %}
 {%- if client.get('enabled', False) %}
 
-include:
-  - kibana.client.service
-
 {%- for object_name, object in client.get('object', {}).iteritems() %}
 kibana_object_{{ object_name }}:
   {%- if object.get('enabled', False) %}
diff --git a/kibana/client/service.sls b/kibana/client/service.sls
deleted file mode 100644
index bc9aa57..0000000
--- a/kibana/client/service.sls
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- from "kibana/map.jinja" import client with context %}
-{%- if client.get('enabled', False) %}
-
-/etc/salt/minion.d/_kibana.conf:
-  file.managed:
-  - source: salt://kibana/files/_kibana.conf
-  - template: jinja
-  - user: root
-  - group: root
-
-{%- endif %}
diff --git a/kibana/files/_kibana.conf b/kibana/files/_kibana.conf
deleted file mode 100644
index 410e2b2..0000000
--- a/kibana/files/_kibana.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-{%- from "kibana/map.jinja" import client with context %}
-
-kibana:
-  kibana_url: {{ client.server.host }}:{{ client.server.port }}
-  kibana_index: {{ client.server.index }}
diff --git a/kibana/meta/salt.yml b/kibana/meta/salt.yml
new file mode 100644
index 0000000..d4719c7
--- /dev/null
+++ b/kibana/meta/salt.yml
@@ -0,0 +1,8 @@
+minion:
+  {%- if pillar.kibana.client is defined %}
+  kibana:
+    {%- from "kibana/map.jinja" import client with context %}
+    kibana:
+      kibana_url: {{ client.server.host }}:{{ client.server.port }}
+      kibana_index: {{ client.server.index }}
+  {%- endif %}
diff --git a/kibana/server.sls b/kibana/server.sls
index 6898a97..be45f86 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -1,5 +1,4 @@
 {%- from "kibana/map.jinja" import server with context %}
-{%- from "linux/map.jinja" import system with context %}
 {%- if server.enabled %}
 
 kibana_package: