diff --git a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts
index c917fc0dcd..8f6e42328f 100644
--- a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts
@@ -33,7 +33,6 @@ import { GroupCloudWidgetComponent } from './components/widgets/group/group-clou
 import { PeopleCloudWidgetComponent } from './components/widgets/people/people-cloud.widget';
 import { AttachFileCloudWidgetComponent } from './components/widgets/attach-file/attach-file-cloud-widget.component';
 import { UploadCloudWidgetComponent } from './components/widgets/attach-file/upload-cloud.widget';
-import { GroupCloudModule } from '../group/group-cloud.module';
 import { PropertiesViewerWidgetComponent } from './components/widgets/properties-viewer/properties-viewer.widget';
 import { PropertiesViewerWrapperComponent } from './components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer-wrapper.component';
 import { RadioButtonsCloudWidgetComponent } from './components/widgets/radio-buttons/radio-buttons-cloud.widget';
@@ -45,6 +44,7 @@ import { A11yModule } from '@angular/cdk/a11y';
 import { OverlayModule } from '@angular/cdk/overlay';
 import { FormSpinnerComponent } from './components/spinner/form-spinner.component';
 import { PeopleCloudComponent } from '../people/components/people-cloud.component';
+import { GroupCloudComponent } from '../group/components/group-cloud.component';
 
 @NgModule({
     imports: [
@@ -56,7 +56,7 @@ import { PeopleCloudComponent } from '../people/components/people-cloud.componen
         CoreModule,
         ContentNodeSelectorModule,
         PeopleCloudComponent,
-        GroupCloudModule,
+        GroupCloudComponent,
         RichTextEditorComponent,
         ...TOOLBAR_DIRECTIVES,
         A11yModule,
diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.stories.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.stories.ts
index 0c49340624..856c0b51e3 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.stories.ts
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.stories.ts
@@ -16,7 +16,6 @@
  */
 
 import { applicationConfig, Meta, moduleMetadata, StoryFn } from '@storybook/angular';
-import { GroupCloudModule } from '../group-cloud.module';
 import { GroupCloudComponent } from './group-cloud.component';
 import { ProcessServicesCloudStoryModule } from '../../testing/process-services-cloud-story.module';
 import { IdentityGroupService } from '../services/identity-group.service';
@@ -28,13 +27,10 @@ export default {
     title: 'Process Services Cloud/Group Cloud/Group Cloud',
     decorators: [
         moduleMetadata({
-            imports: [GroupCloudModule]
+            imports: [GroupCloudComponent]
         }),
         applicationConfig({
-            providers: [
-                { provide: IdentityGroupService, useClass: IdentityGroupServiceMock },
-                importProvidersFrom(ProcessServicesCloudStoryModule)
-            ]
+            providers: [{ provide: IdentityGroupService, useClass: IdentityGroupServiceMock }, importProvidersFrom(ProcessServicesCloudStoryModule)]
         })
     ],
     argTypes: {
@@ -102,7 +98,7 @@ export default {
             description: 'FormControl to list of group.',
             table: {
                 type: { summary: 'FormControl' },
-                defaultValue: { summary: 'new FormControl({ value: \'\', disabled: false })' },
+                defaultValue: { summary: `new FormControl({ value: '', disabled: false })` },
                 category: 'Form Controls'
             }
         },
@@ -111,7 +107,7 @@ export default {
             description: 'FormControl to search the group.',
             table: {
                 type: { summary: 'FormControl' },
-                defaultValue: { summary: 'new FormControl({ value: \'\', disabled: false })' },
+                defaultValue: { summary: `new FormControl({ value: '', disabled: false })` },
                 category: 'Form Controls'
             }
         },
diff --git a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts
index f250ef3ab0..7cce0da2d0 100644
--- a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts
@@ -20,7 +20,6 @@ import { CoreModule, FormRenderingService, provideTranslations } from '@alfresco
 import { APP_LIST_CLOUD_DIRECTIVES } from './app/app-list-cloud.module';
 import { TaskCloudModule } from './task/task-cloud.module';
 import { ProcessCloudModule } from './process/process-cloud.module';
-import { GroupCloudModule } from './group/group-cloud.module';
 import { FormCloudModule } from './form/form-cloud.module';
 import {
     LocalPreferenceCloudService,
@@ -36,6 +35,7 @@ import { ProcessNameCloudPipe } from './pipes/process-name-cloud.pipe';
 import { PeopleCloudComponent } from './people/components/people-cloud.component';
 import { RichTextEditorComponent } from './rich-text-editor';
 import { TaskFormCloudComponent } from './task/task-form/components/task-form-cloud.component';
+import { GroupCloudComponent } from './group/components/group-cloud.component';
 
 @NgModule({
     imports: [
@@ -43,7 +43,7 @@ import { TaskFormCloudComponent } from './task/task-form/components/task-form-cl
         ...APP_LIST_CLOUD_DIRECTIVES,
         ProcessCloudModule,
         TaskCloudModule,
-        GroupCloudModule,
+        GroupCloudComponent,
         PeopleCloudComponent,
         FormCloudModule,
         TaskFormCloudComponent,
@@ -56,7 +56,7 @@ import { TaskFormCloudComponent } from './task/task-form/components/task-form-cl
         ...APP_LIST_CLOUD_DIRECTIVES,
         ProcessCloudModule,
         TaskCloudModule,
-        GroupCloudModule,
+        GroupCloudComponent,
         FormCloudModule,
         TaskFormCloudComponent,
         PeopleCloudComponent,
diff --git a/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts b/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts
index 47c614baa5..1527dc45b6 100644
--- a/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts
@@ -21,12 +21,12 @@ import { MaterialModule } from '../../material.module';
 import { CoreModule } from '@alfresco/adf-core';
 import { StartTaskCloudComponent } from './components/start-task-cloud.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { GroupCloudModule } from '../../group/group-cloud.module';
 import { FormCloudModule } from '../../form/form-cloud.module';
 import { PeopleCloudComponent } from '../../people/components/people-cloud.component';
+import { GroupCloudComponent } from '../../group/components/group-cloud.component';
 
 @NgModule({
-    imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, GroupCloudModule, CoreModule, FormCloudModule, PeopleCloudComponent],
+    imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, GroupCloudComponent, CoreModule, FormCloudModule, PeopleCloudComponent],
     declarations: [StartTaskCloudComponent],
     exports: [StartTaskCloudComponent]
 })
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts
index 8c00b6dd44..bad2bc2a4d 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts
@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TaskAssignmentFilterCloudComponent } from './task-assignment-filter.component';
-import { GroupCloudModule } from '../../../../group/group-cloud.module';
 import { TaskFiltersCloudModule } from '../../task-filters-cloud.module';
 import { AssignmentType, TaskStatusFilter } from '../../models/filter-cloud.model';
 import { IdentityUserService } from '../../../../people/services/identity-user.service';
@@ -30,6 +29,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatSelectHarness } from '@angular/material/select/testing';
 import { MatFormFieldHarness } from '@angular/material/form-field/testing';
 import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module';
+import { GroupCloudComponent } from '@alfresco/adf-process-services-cloud';
 
 describe('TaskAssignmentFilterComponent', () => {
     let component: TaskAssignmentFilterCloudComponent;
@@ -58,7 +58,7 @@ describe('TaskAssignmentFilterComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ProcessServiceCloudTestingModule, GroupCloudModule, TaskFiltersCloudModule]
+            imports: [ProcessServiceCloudTestingModule, GroupCloudComponent, TaskFiltersCloudModule]
         });
     });
 
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts b/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts
index 30c463933c..3e21df0b94 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts
@@ -28,10 +28,10 @@ import { EditTaskFilterCloudComponent } from './components/edit-task-filters/edi
 import { TaskFilterDialogCloudComponent } from './components/task-filter-dialog/task-filter-dialog-cloud.component';
 import { ServiceTaskFiltersCloudComponent } from './components/service-task-filters-cloud.component';
 import { TaskAssignmentFilterCloudComponent } from './components/task-assignment-filter/task-assignment-filter.component';
-import { GroupCloudModule } from '../../group/group-cloud.module';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { DateRangeFilterComponent } from '../../common/date-range-filter/date-range-filter.component';
 import { PeopleCloudComponent } from '../../people/components/people-cloud.component';
+import { GroupCloudComponent } from '../../group/components/group-cloud.component';
 
 @NgModule({
     imports: [
@@ -42,7 +42,7 @@ import { PeopleCloudComponent } from '../../people/components/people-cloud.compo
         MaterialModule,
         ...APP_LIST_CLOUD_DIRECTIVES,
         CoreModule,
-        GroupCloudModule,
+        GroupCloudComponent,
         DateRangeFilterComponent,
         PeopleCloudComponent,
         MatProgressSpinnerModule