diff --git a/kubernetes/files/kubernetes.grain b/kubernetes/files/kubernetes.grain
deleted file mode 100644
index 5d0a225..0000000
--- a/kubernetes/files/kubernetes.grain
+++ /dev/null
@@ -1,7 +0,0 @@
-{%- from "kubernetes/map.jinja" import pool with context -%}
-{%- if pool.get('service', {})|length > 0 %}
-{%- set service_grains = {'kubernetes': {'service': pool.get('service', {}).get('local', {})}} -%}
-{% else %}
-{%- set service_grains = {'kubernetes': {}} -%}
-{%- endif %}
-{{ service_grains|yaml(False) }}
diff --git a/kubernetes/meta/salt.yml b/kubernetes/meta/salt.yml
new file mode 100644
index 0000000..3f06b43
--- /dev/null
+++ b/kubernetes/meta/salt.yml
@@ -0,0 +1,11 @@
+grain:
+  kubernetes:
+    {%- if pillar.kubernetes.pool is defined %}
+      {%- from "kubernetes/map.jinja" import pool with context %}
+      {%- if pool.get('service', {})|length > 0 %}
+        {%- set service_grains = {'kubernetes': {'service': pool.get('service', {}).get('local', {})}} -%}
+      {% else %}
+        {%- set service_grains = {'kubernetes': {}} -%}
+      {%- endif %}
+    {{ service_grains|yaml(False)|indent(4) }}
+    {%- endif %}
diff --git a/kubernetes/pool/service.sls b/kubernetes/pool/service.sls
index 6abce3c..8529b13 100644
--- a/kubernetes/pool/service.sls
+++ b/kubernetes/pool/service.sls
@@ -5,20 +5,4 @@
 include:
 - kubernetes._common
 
-kubernetes_pool_container_grains_dir:
-  file.directory:
-  - name: /etc/salt/grains.d
-  - mode: 700
-  - makedirs: true
-  - user: root
-
-kubernetes_pool_container_grain:
-  file.managed:
-  - name: /etc/salt/grains.d/kubernetes
-  - source: salt://kubernetes/files/kubernetes.grain
-  - template: jinja
-  - mode: 600
-  - require:
-    - file: kubernetes_pool_container_grains_dir
-
-{%- endif %}
\ No newline at end of file
+{%- endif %}