diff --git a/defaults/main.yaml b/defaults/main.yaml
index 83334b3..4d20dbc 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -16,10 +16,10 @@ workflows:
 #   - create_system_service
 #   - delete_system_service
 #   - add_all_system_services_to_vre
-   - create_workspace_client
+#   - create_workspace_client
    - add_workspace_client_to_context
-   - enable_workspace_clients_for_context
-   - add_workspace_client_to_contexts
+#   - enable_workspace_clients_for_context
+#   - add_workspace_client_to_contexts
 #   - ghn_client_add_to_context
 #   - ghn_client_add_to_contexts
 #   - ghn_client_create
diff --git a/templates/add_workspace_client_to_context.json.j2 b/templates/add_workspace_client_to_context.json.j2
index 8edc4bd..5d2c10b 100644
--- a/templates/add_workspace_client_to_context.json.j2
+++ b/templates/add_workspace_client_to_context.json.j2
@@ -214,7 +214,7 @@
 						"inputParameters" : {
 							"url" : "${init.input.storagehub}/workspace/groups/${shubify_context_name.output.result.shubified_context_name}/admins",
 							"method" : "PUT",
-							"expect" : [200, 400, 500],
+							"expect" : [200, 204, 400, 500],
 							"body" :{
 								"userId" : "${get_service_account_user.output.body.username}"
 							},