diff --git a/templates/add_workspace_client_to_context.json.j2 b/templates/add_workspace_client_to_context.json.j2
index 72e31c4..2761bc0 100644
--- a/templates/add_workspace_client_to_context.json.j2
+++ b/templates/add_workspace_client_to_context.json.j2
@@ -133,7 +133,7 @@
 						"type": "LAMBDA",
 						"inputParameters": {
 							"context_name" : "${extract_context.output.result.client.name}",
-							"scriptExpression": "var s = $.context_name; return { shubified_context_name : (s[0] === '/' ? s.replace('/', '') : s).split('/').join('-')"
+							"scriptExpression": "var s = $.context_name; return { shubified_context_name : (s[0] === '/' ? s.replace('/', '') : s).split('/').join('-')}"
 						}
 					}
 				]
@@ -145,7 +145,7 @@
 		    "type": "JOIN",
 		    "joinOn": [
 		      "get_service_account_user",
-		      "roles_to_assign"
+		      "shubify_context_name"
 		    ]
 		},
 		{