diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts
index d12da7fd44..900d404708 100644
--- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts
+++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts
@@ -45,6 +45,7 @@ describe('People Groups Cloud Component', () => {
         let groupAps;
         let groupActiviti;
         let groupNoRole;
+        let apsUserRoleId;
         let apsAdminRoleId;
         let activitiAdminRoleId;
         let clientActivitiAdminRoleId, clientActivitiUserRoleId;
@@ -73,7 +74,9 @@ describe('People Groups Cloud Component', () => {
 
             groupAps = await groupIdentityService.createIdentityGroup();
             apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.roles.aps_admin);
+            apsUserRoleId = await rolesService.getRoleIdByRoleName(identityService.roles.aps_user);
             await groupIdentityService.assignRole(groupAps.id, apsAdminRoleId, identityService.roles.aps_admin);
+            await groupIdentityService.assignRole(groupAps.id, apsUserRoleId, identityService.roles.aps_user);
             activitiAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.roles.activiti_admin);
             await groupIdentityService.assignRole(groupActiviti.id, activitiAdminRoleId, identityService.roles.activiti_admin);
             groupNoRole = await groupIdentityService.createIdentityGroup();
@@ -161,31 +164,61 @@ describe('People Groups Cloud Component', () => {
             it('No role filtering', () => {
                 peopleGroupCloudComponentPage.clearField(peopleGroupCloudComponentPage.groupRoleInput);
                 groupCloudComponentPage.searchGroups(groupNoRole.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupNoRole.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupNoRole.name);
                 groupCloudComponentPage.searchGroups(groupActiviti.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupActiviti.name);
                 groupCloudComponentPage.searchGroups(groupAps.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
             });
 
             it('One role filtering', () => {
                 peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.roles.aps_admin}"]`);
                 groupCloudComponentPage.searchGroups(groupAps.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
                 groupCloudComponentPage.searchGroups(groupActiviti.name);
-                groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupActiviti.name}`);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupActiviti.name);
                 groupCloudComponentPage.searchGroups(groupNoRole.name);
-                groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
+            });
+
+            it('[C309996] Should be able to filter groups based on composite roles Activit_Admin', () => {
+                peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.roles.activiti_admin}"]`);
+                groupCloudComponentPage.searchGroups(groupActiviti.name);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupActiviti.name);
+                groupCloudComponentPage.searchGroups(groupNoRole.name);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
+                groupCloudComponentPage.searchGroups(groupAps.name);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
+            });
+
+            it('[C309996] Should be able to filter groups based on composite roles Aps_User', () => {
+                peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.roles.aps_user}"]`);
+                groupCloudComponentPage.searchGroups(groupActiviti.name);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupActiviti.name);
+                groupCloudComponentPage.searchGroups(groupNoRole.name);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
+                groupCloudComponentPage.searchGroups(groupAps.name);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
+            });
+
+            it('[C309996] Should be able to filter groups based on composite roles Activiti_User', () => {
+                peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.roles.activiti_user}"]`);
+                groupCloudComponentPage.searchGroups(groupActiviti.name);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupActiviti.name);
+                groupCloudComponentPage.searchGroups(groupNoRole.name);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
+                groupCloudComponentPage.searchGroups(groupAps.name);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
             });
 
             it('Multiple roles filtering', () => {
                 peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.roles.aps_admin}", "${identityService.roles.activiti_admin}"]`);
                 groupCloudComponentPage.searchGroups(groupActiviti.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupActiviti.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupActiviti.name);
                 groupCloudComponentPage.searchGroups(groupAps.name);
-                groupCloudComponentPage.checkGroupIsDisplayed(`${groupAps.name}`);
+                groupCloudComponentPage.checkGroupIsDisplayed(groupAps.name);
                 groupCloudComponentPage.searchGroups(groupNoRole.name);
-                groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`);
+                groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
             });
         });