diff --git a/grafana/client.sls b/grafana/client.sls
index 1275f1b..596b2e0 100644
--- a/grafana/client.sls
+++ b/grafana/client.sls
@@ -1,5 +1,5 @@
 {%- from "grafana/map.jinja" import client with context %}
-{%- if client.enabled %}
+{%- if client.get('enabled', False) %}
 
 /etc/salt/minion.d/_grafana.conf:
   file.managed:
@@ -22,7 +22,7 @@
   - user: {{ datasource.user }}
   - password: {{ datasource.password }}
   {%- endif %}
-  {%- if datasource.get('is_default', false) %}
+  {%- if datasource.get('is_default', False) %}
   - is_default: {{ datasource.is_default|lower }}
   {%- endif %}
   {%- if datasource.database is defined %}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
new file mode 100644
index 0000000..0f8aef7
--- /dev/null
+++ b/metadata/service/client/single.yml
@@ -0,0 +1,6 @@
+applications:
+- grafana.client
+parameters:
+  grafana:
+    client:
+      enabled: true