diff --git a/templates/role_created.json.j2 b/templates/role_created.json.j2
index 80e7d9c..5168aa6 100644
--- a/templates/role_created.json.j2
+++ b/templates/role_created.json.j2
@@ -5,7 +5,7 @@
 	"description": "Handle workflow related to Portal event role_created",
 	"version" : 1,
 	"ownerEmail" : "marco.lettere@nubisware.com",
-	"inputParameters" : ["role"],
+	"inputParameters" : ["role", "first", "max"],
 	"tasks" : [
     {
 		  "name": "LAMBDA_TASK",
@@ -39,7 +39,7 @@
       "taskReferenceName" : "get_all_vres",
       "type" : "SIMPLE",
       "inputParameters" : {
-          "url" : "${init.input.keycloak_admin}/clients?clientId=%252F&search=true&first=0&max=500",
+          "url" : "${init.input.keycloak_admin}/clients?clientId=%252F&search=true&first=${workflow.input.first}&max=${workflow.input.max}",
           "method" : "GET",
           "headers" : {
               "Authorization" : "Bearer ${authorize.output.body.access_token}",
@@ -73,6 +73,23 @@
         "type" : "JOIN",
         "taskReferenceName" : "join_parallel_role_deletion"
     },
+    {
+			"name" : "pyrest",
+			"taskReferenceName" : "authorize2",
+			"type" : "SIMPLE",
+			"inputParameters" : {
+				"url" : "{{ keycloak }}/master/protocol/openid-connect/token",
+				"method" : "POST",
+				"headers" : {
+					"Accept" : "application/json"
+				},
+				"body" : {
+					"client_id" : "orchestrator", 
+					"client_secret" : "{{ keycloak_auth_master }}",
+					"grant_type" : "client_credentials"
+				}
+			}
+		},
     {
       "name": "LAMBDA_TASK",
       "taskReferenceName": "build_add_role_tasks",
@@ -80,7 +97,7 @@
       "inputParameters": {
         "role" : "${workflow.input.role}",
         "vres" : "${get_all_vres.output.body}",
-        "scriptExpression": "inputs={};tasks=[];for(var i=0;i<$.vres.length;i++)vre=$.vres[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role_'+i}),inputs['create_role_'+i]={url:'${init.input.keycloak_admin}/clients/' + vre.id + '/roles',body:{clientRole:true,name:$.role,description: $.role + ' role'},method:'POST',headers:{Authorization:'Bearer ${authorize.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "scriptExpression": "inputs={};tasks=[];for(var i=0;i<$.vres.length;i++)vre=$.vres[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role_'+i}),inputs['create_role_'+i]={url:'${init.input.keycloak_admin}/clients/' + vre.id + '/roles',body:{clientRole:true,name:$.role,description: $.role + ' role'},method:'POST',headers:{Authorization:'Bearer ${authorize2.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
       }
     },
     {
@@ -99,13 +116,30 @@
         "type" : "JOIN",
         "taskReferenceName" : "join_parallel_role_addition"
     },
+    {
+			"name" : "pyrest",
+			"taskReferenceName" : "authorize3",
+			"type" : "SIMPLE",
+			"inputParameters" : {
+				"url" : "{{ keycloak }}/master/protocol/openid-connect/token",
+				"method" : "POST",
+				"headers" : {
+					"Accept" : "application/json"
+				},
+				"body" : {
+					"client_id" : "orchestrator", 
+					"client_secret" : "{{ keycloak_auth_master }}",
+					"grant_type" : "client_credentials"
+				}
+			}
+		},
     {
       "name": "LAMBDA_TASK",
       "taskReferenceName": "build_get_back_role_tasks",
       "type": "LAMBDA",
       "inputParameters": {
         "roleurls" : "${join_parallel_role_addition.output[*]..location}",
-        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.roleurls.length;i++)u=$.roleurls[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'get_back_'+i}),inputs['get_back_'+i]={url:u,method:'GET',headers:{Authorization:'Bearer ${authorize.output.body.access_token}',Accept:'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.roleurls.length;i++)u=$.roleurls[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'get_back_'+i}),inputs['get_back_'+i]={url:u,method:'GET',headers:{Authorization:'Bearer ${authorize3.output.body.access_token}',Accept:'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
       }
     },
     {