diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 2f87d88..77e3eaf 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -377,13 +377,13 @@
     // TODO for stacklight team, should be fixed in model
     //salt.enforceState(master, 'I@sensu:server', 'sensu', true)
 
-    // Finalize the configuration of Grafana (add the dashboards...)
-    salt.enforceState(master, 'I@grafana:client', 'grafana.client.service', true)
-    // nw salt -C 'I@grafana:client' --async service.restart salt-minion; sleep 10
-
     salt.runSaltProcessStep(master, 'I@grafana.client and *01*', 'cmd.run', ['salt-call state.sls grafana.client'], null, true)
     // salt.enforceState(master, 'I@grafana:client and *01*', 'grafana.client', true)
 
+    // Finalize the configuration of Grafana (add the dashboards...)
+    salt.enforceState(master, 'I@grafana:client', 'grafana.client', true)
+    // nw salt -C 'I@grafana:client' --async service.restart salt-minion; sleep 10
+
     // Get the StackLight monitoring VIP addres
     //vip=$(salt-call pillar.data _param:stacklight_monitor_address --out key|grep _param: |awk '{print $2}')
     //vip=${vip:=172.16.10.253}