diff --git a/grafana/server.sls b/grafana/server.sls
index 647f54e..7c66e5c 100644
--- a/grafana/server.sls
+++ b/grafana/server.sls
@@ -84,7 +84,7 @@
 install_{{ plugin_name }}:
   cmd.run:
   - name: grafana-cli plugins install {{ plugin_name }}
-  - unless: grafana-cli plugins list-versions {{ plugin_name }}
+  - unless: grafana-cli plugins ls | grep {{ plugin_name }}
   - watch_in:
     - service: grafana_service
 {%- endif %}
diff --git a/metadata/service/client/single.yml b/metadata/service/client/single.yml
index 831680b..359e2fa 100644
--- a/metadata/service/client/single.yml
+++ b/metadata/service/client/single.yml
@@ -1,5 +1,5 @@
 applications:
-- grafana.client
+- grafana
 parameters:
   grafana:
     client: