diff --git a/templates/role_created.json.j2 b/templates/role_created.json.j2
index 07e8f65..32e121d 100644
--- a/templates/role_created.json.j2
+++ b/templates/role_created.json.j2
@@ -54,7 +54,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', expect:[201,409],headers:{Authorization:'Bearer ${authorize.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
       }
     },
     {
@@ -72,6 +72,31 @@
         "name" : "join",
         "type" : "JOIN",
         "taskReferenceName" : "join_parallel_role_addition"
+    },
+    {
+      "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};
+      }
+    },
+    {
+      "name" : "fork_dynamic",
+      "type" : "FORK_JOIN_DYNAMIC",
+      "taskReferenceName" : "parallel_get_back_role",
+      "inputParameters" : {
+          "tasks" : "${build_get_back_role_tasks.output.result.tasks}",
+          "inputs" : "${build_get_back_role_tasks.output.result.inputs}"
+      },
+      "dynamicForkTasksParam": "tasks",
+      "dynamicForkTasksInputParamName": "inputs"
+    },
+    {
+        "name" : "join",
+        "type" : "JOIN",
+        "taskReferenceName" : "join_parallel_role_get_back"
     }
 	]
 }