diff --git a/salt/top.sls b/salt/top.sls
index d937aad..a534cc5 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -1,5 +1,5 @@
-{% set client_id = salt['grains.get']('id') %}
-{% set roles = salt['grains.get']('roles', []) %}
+{%- set id = salt['grains.get']('id') -%}
+{%- set roles = salt['nbroles.get'](id) -%}
 
 {{ saltenv }}:
   '*':