diff --git a/pillars/servers/passwords.sls b/pillars/servers/passwords.sls
index 891c155..5460066 100644
--- a/pillars/servers/passwords.sls
+++ b/pillars/servers/passwords.sls
@@ -1,3 +1,3 @@
-{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls | tr '\n' ' '") -%}
-{%- set data=salt.cmd.shell('sudo bash ~/get_passwords.sh '+roles) -%}
+{%- from "roles.jinja" import roles with context %}
+{%- set data=salt.cmd.shell('sudo bash ~/get_passwords.sh '+roles | join(' ')) -%}
 {{data | trim}}