diff --git a/defaults/main.yaml b/defaults/main.yaml
index c4473aa..e84bb89 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -14,5 +14,6 @@ keycloak: "{{ keycloak_host }}/realms"
 keycloak_realm: "d4science"
 keycloak_admin: "{{ keycloak_host }}/admin/realms"
 keycloak_auth: "c93501bd-abeb-4228-bc28-afac38877338"
+keycloak_auth_master: "7a64deb5-e8ea-4add-ba8d-26b339994cc9"
 liferay: "https://next.d4science.org/api/jsonws"
 liferay_auth: "bm90aWZpY2F0aW9uc0BkNHNjaWVuY2Uub3JnOmdjdWJlcmFuZG9tMzIx"
diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index 0260f86..2fa8724 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -7,30 +7,30 @@
 	"ownerEmail" : "marco.lettere@nubisware.com",
 	"inputParameters" : ["user", "group"],
 	"tasks" : [
-	    {
-		"name": "LAMBDA_TASK",
-		"taskReferenceName": "init",
-		"type": "LAMBDA",
-		"inputParameters": {
-			"keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
-			"keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
-			"clientId" : "${workflow.input.group}",
-			"scriptExpression": "var tree = $.clientId.split('%2F'); return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/')}"
-			}
+    {
+		  "name": "LAMBDA_TASK",
+		  "taskReferenceName": "init",
+		  "type": "LAMBDA",
+		  "inputParameters": {
+			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
+			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
+			  "clientId" : "${workflow.input.group}",
+			  "scriptExpression": "var tree = $.clientId.split('%2F'); return { 'tree' : tree, 'child': tree[tree.length-1], 'append' : tree.slice(0,-1).join('/'), 'name' : tree.join('/')}"
+		  }
 		},
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "authorize",
 			"type" : "SIMPLE",
 			"inputParameters" : {
-				"url" : "https://accounts.dev.d4science.org/auth/realms/master/protocol/openid-connect/token",
+				"url" : "{{ keycloak }}/master/protocol/openid-connect/token",
 				"method" : "POST",
 				"headers" : {
 					"Accept" : "application/json"
 				},
 				"body" : {
 					"client_id" : "orchestrator", 
-					"client_secret" : "7a64deb5-e8ea-4add-ba8d-26b339994cc9",
+					"client_secret" : "{{ keycloak_auth_master }}",
 					"grant_type" : "client_credentials"
 				}
 			}