diff --git a/defaults/main.yaml b/defaults/main.yaml
index 3b4f08d..45c6c13 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -1,35 +1,35 @@
 ---
 workflows:
-   - create-user-add-to-vre
-   - group_deleted
-   - user-group_created
+   # - create-user-add-to-vre
+   # - group_deleted
+   # - user-group_created
    - user-group-role_created
-   - group_created
-   - invitation-accepted
-   - user-group_deleted
-   - user-group-role_deleted
-   - delete-user-account
-   - role_deleted
-   - role_created
-   - add_role_policy_permission 
-   - add_all_member_roles
-   - create_system_service
-   - delete_system_service
-   - add_all_system_services_to_vre
-   - create_workspace_client
-   - 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
-   - jupyterhub_add_serveroptions_to_context
-   - record_context_to_is
-   - create_vre_folder_for_context
-   - create_vre
+   # - group_created
+   # - invitation-accepted
+   # - user-group_deleted
+   # - user-group-role_deleted
+   # - delete-user-account
+   # - role_deleted
+   # - role_created
+   # - add_role_policy_permission 
+   # - add_all_member_roles
+   # - create_system_service
+   # - delete_system_service
+   # - add_all_system_services_to_vre
+   # - create_workspace_client
+   # - 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
+   # - jupyterhub_add_serveroptions_to_context
+   # - 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/user-group-role_created.json.j2 b/templates/user-group-role_created.json.j2
index fc79893..118faa8 100644
--- a/templates/user-group-role_created.json.j2
+++ b/templates/user-group-role_created.json.j2
@@ -48,36 +48,37 @@
 			}
 		},
 		{
-                     "name": "LAMBDA_TASK",
-                     "taskReferenceName": "select_user",
-                     "inputParameters": {
-                        "foundusers" : "${lookup_user.output.body}",
+			"name": "LAMBDA_TASK",
+			"taskReferenceName": "select_user",
+			"inputParameters": {
+			"foundusers" : "${lookup_user.output.body}",
 			"username" : "${workflow.input.user}",
- 		     	"scriptExpression": "for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return Java.to([$.foundusers[i]], 'java.lang.Object[]')}"
-                     },
-                     "type": "LAMBDA"
-                },
+			"scriptExpression": "for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return Java.to([$.foundusers[i]], 'java.lang.Object[]')}"
+					},
+					"type": "LAMBDA"
+			},
 		{
-                        "name": "check_user_existance",
-                        "taskReferenceName": "check_user_existance",
-                        "inputParameters": {
-                                "user": "${select_user.output.result[0]}"
-                        },
-                        "type": "DECISION",
-                        "caseExpression": "($.user == null ? 'true' : 'false')",
-                        "decisionCases": {
-                                "true": [
-                                        {
-                                                "name" : "terminate",
-                                                "taskReferenceName" : "terminate_when_no_user",
-                                                "type" : "TERMINATE",
-                                                "inputParameters" : {
-                                                        "terminationStatus" : "COMPLETED"
-                                                }
-                                        }
-                                ]
-                        }
-                },
+			"name": "check_user_existance",
+			"taskReferenceName": "check_user_existance",
+			"inputParameters": {
+				"user": "${select_user.output.result[0]}"
+			},
+			"type": "SWITCH",
+			"evaluatorType": "javascript",
+			"caseExpression": "($.user == null ? 'true' : 'false')",
+			"decisionCases": {
+				"true": [
+					{
+							"name" : "terminate",
+							"taskReferenceName" : "terminate_when_no_user",
+							"type" : "TERMINATE",
+							"inputParameters" : {
+									"terminationStatus" : "COMPLETED"
+							}
+					}
+				]
+			}
+		},
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "lookup_client",
@@ -112,7 +113,8 @@
 			"inputParameters": {
 				"prev_status": "${get_client_roles.output.status}"
 			},
-			"type": "DECISION",
+			"type": "SWITCH",
+			"evaluatorType": "value-param",
 			"caseValueParam": "prev_status",
 			"decisionCases": {
 				"200": [