diff --git a/defaults/main.yaml b/defaults/main.yaml
index 3e14084..404921b 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -20,16 +20,16 @@ workflows:
    # - add_workspace_client_to_context
    # - enable_workspace_clients_for_context
    # - add_workspace_client_to_contexts
-   - ghn_client_add_to_context
-   - ghn_client_add_to_contexts
-   - ghn_client_create
-   - ghn_client_delete
-   - ghn_client_remove_from_contexts
-   - ghn_client_remove_from_context
+   # - ghn_client_add_to_context
+   # - ghn_client_add_to_contexts
+   # - ghn_client_create
+   # - ghn_client_delete
+   # - ghn_client_remove_from_contexts
+   # - ghn_client_remove_from_context
    # - jupyterhub_add_serveroptions_to_context
-   # - record_context_to_is
-   # - create_vre_folder_for_context
-   # - create_vre
+   - record_context_to_is
+   - create_vre_folder_for_context
+   - create_vre
 
 keycloak_host: "https://accounts.dev.d4science.org/auth"
 keycloak: "{{ keycloak_host }}/realms"
diff --git a/templates/create_vre.json.j2 b/templates/create_vre.json.j2
index 2d77557..fc3846a 100644
--- a/templates/create_vre.json.j2
+++ b/templates/create_vre.json.j2
@@ -8,15 +8,16 @@
 	"inputParameters" : ["context", "folder_owner", "folder_admins"],
 	"tasks" : [
 		{
-		  "name": "LAMBDA_TASK",
+		  "name": "INLINE_TASK",
 		  "taskReferenceName": "init",
-		  "type": "LAMBDA",
+		  "type": "INLINE",
 		  "inputParameters": {
 			  "root_vo": "{{ root_vo }}",
 			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
 			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 			  "group" : "${workflow.input.context}",
-			  "scriptExpression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; if(e($.group)) throw('Group must not be empty'); var tree = $.group.startsWith('%2F') ? $.group.split('%2F') : [$.group]; return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/'), encoded_root_vo : encodeURI($.root_vo)}"
+			  "evaluatorType" : "javascript",
+			  "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; function f(){if(e($.group)) throw('Group must not be empty'); var tree = $.group.startsWith('%2F') ? $.group.split('%2F') : [$.group]; return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/'), encoded_root_vo : encodeURI($.root_vo)}} f()"
 		  }
 		},
 		{
@@ -69,12 +70,13 @@
 			        }
 		        },
             {
-                "name": "LAMBDA_TASK",
+                "name": "INLINE_TASK",
                 "taskReferenceName": "extract_client_id",
-                "type": "LAMBDA",
+                "type": "INLINE",
                 "inputParameters": {
-                        "client_location" : "${create_client.output.headers.location}",
-                        "scriptExpression": "var client_id = $.client_location.split('/').pop(); return {'client_id' : client_id}"
+					"client_location" : "${create_client.output.headers.location}",
+					"evaluatorType" : "javascript",
+					"expression": "var client_id = $.client_location.split('/').pop(); function f(){return {'client_id' : client_id}} f()"
                 }
             },
 		    {
@@ -91,13 +93,14 @@
 				}
 			},
 			{
-				"name": "LAMBDA_TASK",
+				"name": "INLINE_TASK",
 				"taskReferenceName": "prepare",
-				"type": "LAMBDA",
+				"type": "INLINE",
 				"inputParameters": {
 					"append": "${init.output.result.append}",
 		  			"groups": "${list_kc_groups.output.body}",
-		  			"scriptExpression": "function recurse(inp){for(var i=0;i<inp.length;i++){if(inp[i]['path'] === $.append) return inp[i]; else{var subr = recurse(inp[i].subGroups); if(subr != null) return subr;}} return null}; return {'group' : $.append == '' ? '' : recurse($.groups)}"
+		  			"evaluatorType" : "javascript",
+					"expression": "function recurse(inp){for(var i=0;i<inp.length;i++){if(inp[i]['path'] === $.append) return inp[i]; else{var subr = recurse(inp[i].subGroups); if(subr != null) return subr;}} return null}; function f(){return {'group' : $.append == '' ? '' : recurse($.groups)}} f()"
 				}
 			},
 			{
@@ -106,16 +109,18 @@
 				"inputParameters": {
 					"groupid": "${prepare.output.result.group}"
 				},
-				"type": "DECISION",
-				"caseValueParam": "groupid",
+				"type": "SWITCH",
+				"evaluatorType" : "value-param",
+				"expression": "groupid",
 				"decisionCases": {
 					"": [
 						{
-							"name": "LAMBDA_TASK",
+							"name": "INLINE_TASK",
 							"taskReferenceName": "dummy",
-							"type": "LAMBDA",
+							"type": "INLINE",
 							"inputParameters": {
-								"scriptExpression": "1"
+								"evaluatorType" : "javascript",
+								"expression": "1"
 							}
 						}
 					]
@@ -138,15 +143,15 @@
 						"type": "SIMPLE"
 					},
 					{
-						"name": "LAMBDA_TASK",
+						"name": "INLINE_TASK",
+						"type": "INLINE"
 						"taskReferenceName": "prepare2",
 						"inputParameters": {
-						  "location": "${create_kc_group.output.headers.location}",
-						  "client_location": "${create_client.output.headers.location}",
-
-						  "scriptExpression": "var newid=$.location.split('/').pop(); var client_id = $.client_location.split('/').pop(); return {'newid' : newid, 'client_id' : client_id}"
-						},
-						"type": "LAMBDA"
+							"location": "${create_kc_group.output.headers.location}",
+							"client_location": "${create_client.output.headers.location}",
+							"evaluatorType" : "javascript",
+							"expression": "var newid=$.location.split('/').pop(); var client_id = $.client_location.split('/').pop(); function f(){return {'newid' : newid, 'client_id' : client_id}} f()"
+						}
 					}
 				]
 			},
@@ -363,16 +368,18 @@
 		"inputParameters": {
 			"groupid": "${prepare.output.result.group}"
 		},
-		"type": "DECISION",
-		"caseValueParam": "groupid",
+		"type": "SWITCH",
+		"evaluatorType" : "value-param",
+		"expression": "groupid",
 		"decisionCases": {
 			"": [
 				{
-					"name": "LAMBDA_TASK",
+					"name": "INLINE_TASK",
 					"taskReferenceName": "dummy2",
-					"type": "LAMBDA",
+					"type": "INLINE",
 					"inputParameters": {
-						"scriptExpression": "1"
+						"evaluatorType" : "javascript",
+						"expression": "1"
 					}
 				}
 			]
@@ -413,12 +420,13 @@
 		}
 	},
 	{
-		"name": "LAMBDA_TASK",
+		"name": "INLINE_TASK",
 		"taskReferenceName": "build_add_role_tasks",
-		"type": "LAMBDA",
+		"type": "INLINE",
 		"inputParameters": {
 		  "roles" : "${get_rootvo_roles.output.body}",
-		  "scriptExpression": "inputs={},tasks=[];function add(r, k){ if(r.name != 'uma_protection' && r.name != 'Member'){ tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_'+k}); inputs['create_'+k]={url:'${create_client.output.headers.location}/roles',body:{clientRole:true,name:r.name,description:r.description},method:'POST',headers:{Authorization:'Bearer ${authorize2.output.body.access_token}','Content-Type':'application/json'}}}};for(var i=0;i<$.roles.length;i++)r=$.roles[i],k='add-'+r.name, add(r, k);return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+		  "evaluatorType" : "javascript",
+		  "expression": "inputs={},tasks=[];function add(r, k){ if(r.name != 'uma_protection' && r.name != 'Member'){ tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_'+k}); inputs['create_'+k]={url:'${create_client.output.headers.location}/roles',body:{clientRole:true,name:r.name,description:r.description},method:'POST',headers:{Authorization:'Bearer ${authorize2.output.body.access_token}','Content-Type':'application/json'}}}};for(var i=0;i<$.roles.length;i++)r=$.roles[i],k='add-'+r.name, add(r, k); function f(){return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};} f()"
 		}
 	},
 	{
@@ -455,12 +463,13 @@
 		}
 	},
 	{
-		"name": "LAMBDA_TASK",
+		"name": "INLINE_TASK",
 		"taskReferenceName": "build_get_back_role_tasks",
-		"type": "LAMBDA",
+		"type": "INLINE",
 		"inputParameters": {
 		  "roleurls" : "${join_parallel_role_addition.output[*]..location}",
-		  "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.roleurls.length;i++)u=$.roleurls[i],k='add-'+i,tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'get_back_'+k}),inputs['get_back_'+k]={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};"
+		  "evaluatorType" : "javascript",
+		  "expression": "inputs={},tasks=[];function f(){for(var i=0;i<$.roleurls.length;i++)u=$.roleurls[i],k='add-'+i,tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'get_back_'+k}),inputs['get_back_'+k]={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};} f()"
 		}
 	},
 	{
@@ -497,12 +506,13 @@
 		}
 	},
 	{
-		"name": "LAMBDA_TASK",
+		"name": "INLINE_TASK",
 		"taskReferenceName": "build_add_policy_tasks",
-		"type": "LAMBDA",
+		"type": "INLINE",
 		"inputParameters": {
 		  "roles" : "${join_parallel_getting_back.output[*].body}",
-		  "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.roles.length;i++)r=$.roles[i],k='add-'+r.name,tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role_policy_'+k}),inputs['create_role_policy_'+k]={url:'${init.input.keycloak_admin}/clients/${extract_client_id.output.result.client_id}/authz/resource-server/policy/role',body:{name:r.name+'_policy',description:'',type:'role',logic:'POSITIVE',decisionStrategy:'UNANIMOUS',roles:Java.to([{id:r.id,required:true}], 'java.util.Map[]')},method:'POST',headers:{Authorization:'Bearer ${authorize4.output.body.access_token}', Accept: 'application/json', 'Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+		  "evaluatorType" : "javascript",
+		  "expression": "inputs={},tasks=[];function f(){for(var i=0;i<$.roles.length;i++)r=$.roles[i],k='add-'+r.name,tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role_policy_'+k}),inputs['create_role_policy_'+k]={url:'${init.input.keycloak_admin}/clients/${extract_client_id.output.result.client_id}/authz/resource-server/policy/role',body:{name:r.name+'_policy',description:'',type:'role',logic:'POSITIVE',decisionStrategy:'UNANIMOUS',roles:Java.to([{id:r.id,required:true}], 'java.util.Map[]')},method:'POST',headers:{Authorization:'Bearer ${authorize4.output.body.access_token}', Accept: 'application/json', 'Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};} f()"
 		}
 	},
 	{
@@ -522,13 +532,14 @@
 	  "taskReferenceName" : "join_parallel_policy_addition"
 	},
 	{
-		"name": "LAMBDA_TASK",
+		"name": "INLINE_TASK",
 	  	"taskReferenceName": "policy_list",
-		"type": "LAMBDA",
+		"type": "INLINE",
  		"inputParameters": {
 			"memberpolicy" : "${create_role_policy_member.output.body.id}",
 			"otherpolicies" : "${join_parallel_policy_addition.output[*].body.id}",
-			"scriptExpression": "return Java.to(Java.from($.otherpolicies).concat($.memberpolicy), 'java.lang.String[]')"
+			"evaluatorType" : "javascript",
+			"expression": "function f(){return Java.to(Java.from($.otherpolicies).concat($.memberpolicy), 'java.lang.String[]')} f()"
 		  }
 	},
 	{
diff --git a/templates/create_vre_folder_for_context.json.j2 b/templates/create_vre_folder_for_context.json.j2
index 7165c26..f65e727 100644
--- a/templates/create_vre_folder_for_context.json.j2
+++ b/templates/create_vre_folder_for_context.json.j2
@@ -6,7 +6,8 @@
   "version": 1,
   "tasks": [
     {
-      "name": "LAMBDA_TASK",
+      "name": "INLINE_TASK",
+      "type": "INLINE",
       "taskReferenceName": "init",
       "inputParameters": {
         "root_vo": "{{ root_vo }}",
@@ -15,18 +16,9 @@
 	      "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
         "storagehub" : "{{ storagehub }}/workspace",
         "ctx": "${workflow.input.context}",
-        "scriptExpression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} if(e($.ctx)) throw('Context must not be empty'); return { shubified_context_name : ($.ctx[0] === '%' ? $.ctx.replace('%2F', '') : $.ctx).split('%2F').join('-') }"
-      },
-      "type": "LAMBDA",
-      "decisionCases": {},
-      "defaultCase": [],
-      "forkTasks": [],
-      "startDelay": 0,
-      "joinOn": [],
-      "optional": false,
-      "defaultExclusiveJoinTask": [],
-      "asyncComplete": false,
-      "loopOver": []
+        "evaluatorType" : "javascript",
+        "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} function f(){if(e($.ctx)) throw('Context must not be empty'); return { shubified_context_name : ($.ctx[0] === '%' ? $.ctx.replace('%2F', '') : $.ctx).split('%2F').join('-') }} f()"
+      }
     },
     {
         "name" : "pyrest",
@@ -78,13 +70,14 @@
       "loopOver": []
     },
     {
-      "name": "LAMBDA_TASK",
+      "name": "INLINE_TASK",
       "taskReferenceName": "build_add_vre_folder_users_tasks",
-      "type": "LAMBDA",
+      "type": "INLINE",
       "inputParameters": {
         "admins" : "${workflow.input.folder_admins}",
         "url": "${init.input.storagehub}/groups/${init.output.result.shubified_context_name}/users",
-        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'tu_'+i}),inputs['tu_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "evaluatorType" : "javascript",
+        "expression": "inputs={},tasks=[];function f(){for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'tu_'+i}),inputs['tu_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};} f()"
       }
     },
     {
@@ -104,13 +97,14 @@
       "taskReferenceName" : "join_parallel_add_vre_folder_users"
     },
     {
-      "name": "LAMBDA_TASK",
+      "name": "INLINE_TASK",
       "taskReferenceName": "build_add_vre_folder_admins_tasks",
-      "type": "LAMBDA",
+      "type": "INLINE",
       "inputParameters": {
         "admins" : "${workflow.input.folder_admins}",
         "url": "${init.input.storagehub}/groups/${init.output.result.shubified_context_name}/admins",
-        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'ta_'+i}),inputs['ta_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "evaluatorType" : "javascript",
+        "expression": "inputs={},tasks=[];function f(){for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'ta_'+i}),inputs['ta_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};} f()"
       }
     },
     {
diff --git a/templates/record_context_to_is.json.j2 b/templates/record_context_to_is.json.j2
index 71eb9cc..db79c78 100644
--- a/templates/record_context_to_is.json.j2
+++ b/templates/record_context_to_is.json.j2
@@ -6,7 +6,8 @@
   "version": 1,
   "tasks": [
     {
-      "name": "LAMBDA_TASK",
+      "name": "INLINE_TASK",
+      "type" : "INLINE",
       "taskReferenceName": "init",
       "inputParameters": {
         "base_url": "{{is_url}}/resource-registry/contexts",
@@ -15,18 +16,9 @@
 	      "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 	      "ctx": "${workflow.input.context}",
         "ic_proxy" : "{{ ic_proxy }}",
-        "scriptExpression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} if(e($.ctx)) throw('Context must not be empty'); var tree = $.ctx.split('%2F'); return { child : tree[tree.length - 1], parent : tree[tree.length-2], decoded_root_vo : $.root_vo.replace('%2F', '/') }"
-      },
-      "type": "LAMBDA",
-      "decisionCases": {},
-      "defaultCase": [],
-      "forkTasks": [],
-      "startDelay": 0,
-      "joinOn": [],
-      "optional": false,
-      "defaultExclusiveJoinTask": [],
-      "asyncComplete": false,
-      "loopOver": []
+        "evaluatorType" : "javascript",
+        "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} function f(){if(e($.ctx)) throw('Context must not be empty'); var tree = $.ctx.split('%2F'); return { child : tree[tree.length - 1], parent : tree[tree.length-2], decoded_root_vo : $.root_vo.replace('%2F', '/') }} f()"
+      }
     },
     {
       "name" : "parallel_ic_proxy_queries",
@@ -126,13 +118,14 @@
       "joinOn": ["extract_infrastructure_id", "extract_vre_id"]
     },
     {
-      "type" : "LAMBDA",
-      "name": "LAMBDA_TASK",
+      "type" : "INLINE",
+      "name": "INLINE_TASK",
       "taskReferenceName": "check",
       "inputParameters": {
         "vre": "${extract_vre_id.output.result[0]}",
         "infra": "${extract_infrastructure_id.output.result[0]}",
-        "scriptExpression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} if(e($.vre) || e($.infra)) throw('VRE ID and Infra ID must not be empty'); {}"
+        "evaluatorType" : "javascript",
+        "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))} function f(){if(e($.vre) || e($.infra)) throw('VRE ID and Infra ID must not be empty');} f()"
       }
     },
     {