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 c23fac6479..4a994895ee 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
@@ -21,7 +21,7 @@ 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 { FORM_CLOUD_DIRECTIVES } from './form/form-cloud.module';
-import { TaskFormModule } from './task/task-form/task-form.module';
+import { TASK_FORM_CLOUD_DIRECTIVES } from './task/task-form/task-form.module';
 import {
     LocalPreferenceCloudService,
     PreferenceCloudServiceInterface,
@@ -45,7 +45,7 @@ import { PeopleCloudComponent } from './people/components/people-cloud.component
         GroupCloudComponent,
         PeopleCloudComponent,
         ...FORM_CLOUD_DIRECTIVES,
-        TaskFormModule,
+        ...TASK_FORM_CLOUD_DIRECTIVES,
         ApolloModule,
         RichTextEditorComponent
     ],
@@ -56,7 +56,7 @@ import { PeopleCloudComponent } from './people/components/people-cloud.component
         TaskCloudModule,
         GroupCloudComponent,
         ...FORM_CLOUD_DIRECTIVES,
-        TaskFormModule,
+        ...TASK_FORM_CLOUD_DIRECTIVES,
         PeopleCloudComponent,
         RichTextEditorComponent
     ]
diff --git a/lib/process-services-cloud/src/lib/task/task-cloud.module.ts b/lib/process-services-cloud/src/lib/task/task-cloud.module.ts
index 49469480a7..7dd035f19c 100644
--- a/lib/process-services-cloud/src/lib/task/task-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-cloud.module.ts
@@ -19,11 +19,11 @@ import { NgModule } from '@angular/core';
 import { TaskListCloudModule } from './task-list/task-list-cloud.module';
 import { TASK_FILTERS_CLOUD_DIRECTIVES } from './task-filters/task-filters-cloud.module';
 import { TASK_DIRECTIVES } from './directives/task-directive.module';
-import { TaskFormModule } from './task-form/task-form.module';
+import { TASK_FORM_CLOUD_DIRECTIVES } from './task-form/task-form.module';
 import { TaskHeaderCloudComponent } from './task-header/components/task-header-cloud.component';
 
 @NgModule({
-    imports: [TaskListCloudModule, ...TASK_FILTERS_CLOUD_DIRECTIVES, TaskHeaderCloudComponent, ...TASK_DIRECTIVES, TaskFormModule],
-    exports: [TaskListCloudModule, ...TASK_FILTERS_CLOUD_DIRECTIVES, TaskHeaderCloudComponent, ...TASK_DIRECTIVES, TaskFormModule]
+    imports: [TaskListCloudModule, ...TASK_FILTERS_CLOUD_DIRECTIVES, TaskHeaderCloudComponent, ...TASK_DIRECTIVES, ...TASK_FORM_CLOUD_DIRECTIVES],
+    exports: [TaskListCloudModule, ...TASK_FILTERS_CLOUD_DIRECTIVES, TaskHeaderCloudComponent, ...TASK_DIRECTIVES, ...TASK_FORM_CLOUD_DIRECTIVES]
 })
 export class TaskCloudModule {}
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts b/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts
index 3a296f94b9..5eace95e18 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-export * from './components/task-filters/task-filters-cloud.component';
-export * from './components/service-task-filters/service-task-filters-cloud.component';
 export * from './components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component';
 export * from './components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component';
-
+export * from './components/service-task-filters/service-task-filters-cloud.component';
+export * from './components/task-assignment-filter/task-assignment-filter.component';
+export * from './components/task-filter-dialog/task-filter-dialog-cloud.component';
+export * from './components/task-filters/task-filters-cloud.component';
 export * from './models/filter-cloud.model';
-
 export * from './services/task-filter-cloud.service';
 export * from './services/service-task-filter-cloud.service';
-
 export * from './task-filters-cloud.module';
diff --git a/lib/process-services-cloud/src/lib/task/task-form/public-api.ts b/lib/process-services-cloud/src/lib/task/task-form/public-api.ts
index ed10ea7e25..b65e4a47e8 100644
--- a/lib/process-services-cloud/src/lib/task/task-form/public-api.ts
+++ b/lib/process-services-cloud/src/lib/task/task-form/public-api.ts
@@ -17,5 +17,5 @@
 
 export * from './components/task-form-cloud/task-form-cloud.component';
 export * from './components/user-task-cloud/user-task-cloud.component';
-
+export * from './components/user-task-cloud-buttons/user-task-cloud-buttons.component';
 export * from './task-form.module';
diff --git a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts
index d965183ac7..78eaeca792 100644
--- a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts
@@ -16,23 +16,15 @@
  */
 
 import { NgModule } from '@angular/core';
-import { FORM_CLOUD_DIRECTIVES } from '../../form/form-cloud.module';
-import { TASK_DIRECTIVES } from '../directives/task-directive.module';
 import { TaskFormCloudComponent } from './components/task-form-cloud/task-form-cloud.component';
-import { TaskScreenCloudComponent } from '../../screen/components/screen-cloud/screen-cloud.component';
 import { UserTaskCloudComponent } from './components/user-task-cloud/user-task-cloud.component';
 import { UserTaskCloudButtonsComponent } from './components/user-task-cloud-buttons/user-task-cloud-buttons.component';
 
-/** @deprecated use standalone component imports instead */
+export const TASK_FORM_CLOUD_DIRECTIVES = [UserTaskCloudButtonsComponent, TaskFormCloudComponent, UserTaskCloudComponent] as const;
+
+/** @deprecated use standalone component imports instead (...TASK_FORM_CLOUD_DIRECTIVES) */
 @NgModule({
-    imports: [
-        ...FORM_CLOUD_DIRECTIVES,
-        ...TASK_DIRECTIVES,
-        TaskScreenCloudComponent,
-        UserTaskCloudButtonsComponent,
-        TaskFormCloudComponent,
-        UserTaskCloudComponent
-    ],
-    exports: [TaskFormCloudComponent, UserTaskCloudComponent]
+    imports: [...TASK_FORM_CLOUD_DIRECTIVES],
+    exports: [...TASK_FORM_CLOUD_DIRECTIVES]
 })
 export class TaskFormModule {}