diff --git a/defaults/main.yaml b/defaults/main.yaml
index 269e372..74e799e 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -4,7 +4,7 @@ workflows:
 #   - group_deleted
 #   - user-group_created
 #   - user-group-role_created
-#   - group_created
+   - group_created
 #   - invitation-accepted
 #   - user-group_deleted
 #   - user-group-role_deleted
@@ -26,7 +26,7 @@ workflows:
 #   - ghn_client_delete
 #   - ghn_client_remove_from_contexts
 #   - ghn_client_remove_from_context
-    - jupyterhub_add_serveroptions_to_context
+#   - jupyterhub_add_serveroptions_to_context
 
 keycloak_host: "https://accounts.dev.d4science.org/auth"
 keycloak: "{{ keycloak_host }}/realms"
diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index 14509c6..147e847 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -526,15 +526,46 @@
 		  }
 	  },
 	  {
-		  "name": "sub_workflow_task",
-		  "taskReferenceName": "call_enable_workspace_clients_for_context",
-		  "subWorkflowParam": {
-			"name": "enable_workspace_clients_for_context"
-		  },
-		  "inputParameters": {
-  			"context" : "${workflow.input.group}"
-		  },
-		  "type": "SUB_WORKFLOW"
-	   }
+        "name" : "fork_subworkflows",
+        "type" : "FORK_JOIN",
+        "taskReferenceName" : "parallel_call_subworkflows",
+        "forkTasks" : [
+        	[
+    			{
+				  "name": "sub_workflow_task",
+				  "taskReferenceName": "call_enable_workspace_clients_for_context",
+				  "subWorkflowParam": {
+					"name": "enable_workspace_clients_for_context"
+				  },
+				  "inputParameters": {
+		  			"context" : "${workflow.input.group}"
+				  },
+				  "type": "SUB_WORKFLOW"
+			   }
+        	],
+        	[
+				{
+				  "name": "sub_workflow_task",
+				  "taskReferenceName": "call_jupyterhub_add_serveroptions_to_context",
+				  "subWorkflowParam": {
+					"name": "jupyterhub_add_serveroptions_to_context"
+				  },
+				  "inputParameters": {
+		  			"context" : "${workflow.input.group}"
+				  },
+				  "type": "SUB_WORKFLOW"
+			   }        		
+        	]
+        ]
+      },
+      {
+    	  "name" : "join",
+          "type" : "JOIN",
+          "taskReferenceName" : "join_parallel_call_subworkflows"
+		  "joinOn :[
+		  	"call_enable_workspace_clients_for_context",
+		  	"call_jupyterhub_add_serveroptions_to_context"
+		  ] 
+      }
 	]
 }