diff --git a/keystone/client/resources/v3.sls b/keystone/client/resources/v3.sls
index f276b23..d8746c4 100644
--- a/keystone/client/resources/v3.sls
+++ b/keystone/client/resources/v3.sls
@@ -200,7 +200,7 @@
   {%- for role_name,role in user.get('roles', {}).iteritems() %}
     {%- if role.get('status', 'assigned') == 'assigned' %}
 
-keystone_user_{{ user_name }}_role_{{ role.name }}_assigned:
+keystone_user_{{ user_name }}_role_{{ role.name }}{{ '_' + role.project_id if role.project_id }}_assigned:
   keystonev3.user_role_assigned:
     - name: {{ user.get('name', user_name) }}
     - role_id: {{ role.name }}
@@ -219,7 +219,7 @@
 
     {%- elif role.get('status', 'assigned') == 'unassigned' %}
 
-keystone_user_{{ user_name }}_role_{{ role.name }}_unassign:
+keystone_user_{{ user_name }}_role_{{ role.name }}{{ '_' + role.project_id if role.project_id }}_unassign:
   keystonev3.user_role_unassign:
     - name: {{ user.get('name', user_name) }}
     - role_id: {{ role.name }}