diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index 76405c5..0cc33ef 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -222,6 +222,29 @@
 						}
 					}
 				},
+				{
+					"name": "jq_1",
+					"taskReferenceName": "to_array",
+					"type": "JSON_JQ_TRANSFORM",
+					"inputParameters": {
+						"role": "${get_back_role_member.output.body}",
+				        "queryExpression" : "."
+				    }
+				},
+				{
+					"name" : "pyrest",
+					"taskReferenceName" : "add_role_member_as_component_of_infrastructure_member",
+					"type" : "SIMPLE",
+					"inputParameters" : {
+						"url" : "${init.input.keycloak_admin}/roles/Infrastructure-Member/composites",
+						"method" : "POST",
+						"headers" : {
+							"Authorization" : "Bearer ${authorize.output.body.access_token}",
+							"Accept" : "application/json"
+						},
+						"body" : "${to_array.output.resultList}"
+					}
+				},
 				{
 					  "name" : "pyrest",
 					  "taskReferenceName" : "create_role_policy_member",
@@ -229,18 +252,18 @@
 					  "inputParameters" : {
 						  "url" : "${init.input.keycloak_admin}/clients/${extract_client_id.output.result.client_id}/authz/resource-server/policy/role",
 						  "body" : {
-                 "name": "Member_policy",
-                 "description": "",
-                 "type" : "role",
-                 "logic": "POSITIVE",
-                 "decisionStrategy": "UNANIMOUS",
-                 "roles" : [
-                    {
-                      "id" : "${get_back_role_member.output.body.id}",
-                      "required" : true
-                    }
-                 ]
-              },
+						     "name": "Member_policy",
+						     "description": "",
+						     "type" : "role",
+						     "logic": "POSITIVE",
+						     "decisionStrategy": "UNANIMOUS",
+						     "roles" : [
+						        {
+						          "id" : "${get_back_role_member.output.body.id}",
+						          "required" : true
+						        }
+						     ]
+						  },
 						  "method" : "POST",
 						  "headers" : {
 							  "Authorization" : "Bearer ${authorize.output.body.access_token}",
diff --git a/templates/group_deleted.json.j2 b/templates/group_deleted.json.j2
index 0e0a7f9..b89013b 100644
--- a/templates/group_deleted.json.j2
+++ b/templates/group_deleted.json.j2
@@ -95,6 +95,29 @@
 					"Authorization" : "Bearer ${authorize.output.body.access_token}"
 				}
 			}
-		}
+		},
+		{
+			"name" : "pyrest",
+			"taskReferenceName" : "list_realm_components",
+			"type" : "SIMPLE",
+			"inputParameters" : {
+				"url" : "${init.input.keycloak_admin}/components",
+				"method" : "GET",
+				"headers" : {
+					"Authorization" : "Bearer ${authorize.output.body.access_token}",
+					"Accept" : "application/json"
+				}
+			}
+		},
+		{
+			"name": "LAMBDA_TASK",
+			"taskReferenceName": "find_component_by_type",
+			"type": "LAMBDA",
+			"inputParameters": {
+				"path" : "${init.output.result}",
+				"components" : "${list_realm_components}",
+				"scriptExpression": ""
+			}
+		},
 	]
 }