diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index bcf4f1b..4f9d162 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -158,7 +158,7 @@
               "taskReferenceName" : "get_rootvo",
               "type" : "SIMPLE",
               "inputParameters" : {
-                  "url" : "${init.input.keycloak_admin}/clients?clientId=${init.output.encoded_root_vo}",
+                  "url" : "${init.input.keycloak_admin}/clients?clientId=${init.output.result.encoded_root_vo}",
                   "method" : "GET",
                   "headers" : {
                       "Authorization" : "Bearer ${authorize.output.body.access_token}",
diff --git a/templates/role_created.json.j2 b/templates/role_created.json.j2
index add79a3..07e8f65 100644
--- a/templates/role_created.json.j2
+++ b/templates/role_created.json.j2
@@ -54,24 +54,24 @@
       "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:''},method:'POST',headers:{Authorization:'Bearer ${authorize.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
-            }
-          },
-          {
-            "name" : "fork_dynamic",
-            "type" : "FORK_JOIN_DYNAMIC",
-            "taskReferenceName" : "parallel_add_role",
-            "inputParameters" : {
-                "tasks" : "${build_add_role_tasks.output.result.tasks}",
-                "inputs" : "${build_add_role_tasks.output.result.inputs}"
-            },
-            "dynamicForkTasksParam": "tasks",
-            "dynamicForkTasksInputParamName": "inputs"
-          },
-          {
-              "name" : "join",
-              "type" : "JOIN",
-              "taskReferenceName" : "join_parallel_role_addition"
-          }
+        "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};"
+      }
+    },
+    {
+      "name" : "fork_dynamic",
+      "type" : "FORK_JOIN_DYNAMIC",
+      "taskReferenceName" : "parallel_add_role",
+      "inputParameters" : {
+          "tasks" : "${build_add_role_tasks.output.result.tasks}",
+          "inputs" : "${build_add_role_tasks.output.result.inputs}"
+      },
+      "dynamicForkTasksParam": "tasks",
+      "dynamicForkTasksInputParamName": "inputs"
+    },
+    {
+        "name" : "join",
+        "type" : "JOIN",
+        "taskReferenceName" : "join_parallel_role_addition"
+    }
 	]
 }