diff --git a/templates/enable_workspace_clients_for_context.json.j2 b/templates/enable_workspace_clients_for_context.json.j2
index 01892a6..c9d7ed6 100644
--- a/templates/enable_workspace_clients_for_context.json.j2
+++ b/templates/enable_workspace_clients_for_context.json.j2
@@ -69,6 +69,32 @@
 				"filter" : "${init.output.result.filter}",
 				"scriptExpression": "names=Java.from($.names); f=Java.from($.filter); if(f.length === 0) output=names; else { output=[]; for(i=0;i<names.length;i++){ if(f.indexOf(names[i]) !== -1) output.push(names[i])}} return { 'names' : Java.to(output, 'java.lang.String[]')}"
 			}
+		},
+		{
+		  "name": "LAMBDA_TASK",
+		  "taskReferenceName": "build_add_workspace_client_to_context_tasks",
+		  "type": "LAMBDA",
+		  "inputParameters": {
+		    "context" : "${workflow.input.context}",
+		    "names" : "${filtered_workspace_client_names.output.result}",
+		    "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.names.length;i++),tasks.push({name:'sub_workflow_task',type:'SUB_WORKFLOW',taskReferenceName:'call_add_ws_client_to_context_'+i, subWorkflowParam:{ name:'add_workspace_client_to_context'}}),inputs['call_add_ws_client_to_context_'+i]={client_id:$.names[i], context:$.context};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+		  }
+		},
+		{
+		  "name" : "fork_dynamic",
+		  "type" : "FORK_JOIN_DYNAMIC",
+		  "taskReferenceName" : "parallel_add_workspace_client_to_context_tasks",
+		  "inputParameters" : {
+		      "tasks" : "${build_add_workspace_client_to_context_tasks.output.result.tasks}",
+		      "inputs" : "${build_add_workspace_client_to_context_tasks.output.result.inputs}"
+		  },
+		  "dynamicForkTasksParam": "tasks",
+		  "dynamicForkTasksInputParamName": "inputs"
+		},
+		{
+		    "name" : "join",
+		    "type" : "JOIN",
+		    "taskReferenceName" : "parallel_add_workspace_client_to_context_tasks"
 		}
 	]
 }