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 6122c1ee39a..c312dc87d69 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
@@ -24,7 +24,7 @@ import { MaterialModule } from '../material.module';
 import { FormCloudComponent } from './components/form-cloud.component';
 import { FormDefinitionSelectorCloudComponent } from './components/form-definition-selector-cloud.component';
 import { FormCustomOutcomesComponent } from './components/form-cloud-custom-outcomes.component';
-import { ContentMetadataModule, ContentModule, ContentNodeSelectorModule, UploadModule } from '@alfresco/adf-content-services';
+import { AlfrescoViewerModule, ContentMetadataModule, ContentNodeSelectorModule, UploadModule } from '@alfresco/adf-content-services';
 
 import { DateCloudWidgetComponent } from './components/widgets/date/date-cloud.widget';
 import { DropdownCloudWidgetComponent } from './components/widgets/dropdown/dropdown-cloud.widget';
@@ -54,7 +54,7 @@ import { FileViewerWidgetComponent } from './components/widgets/file-viewer/file
         GroupCloudModule,
         ContentMetadataModule,
         UploadModule,
-        ContentModule
+        AlfrescoViewerModule
     ],
     declarations: [
         FormCloudComponent,
@@ -84,7 +84,6 @@ import { FileViewerWidgetComponent } from './components/widgets/file-viewer/file
         PeopleCloudWidgetComponent,
         GroupCloudWidgetComponent,
         PropertiesViewerWidgetComponent,
-        ContentModule,
         FileViewerWidgetComponent
     ]
 })
diff --git a/lib/process-services/src/lib/form/form.module.ts b/lib/process-services/src/lib/form/form.module.ts
index 4fd032a90f0..d071fd3dca9 100644
--- a/lib/process-services/src/lib/form/form.module.ts
+++ b/lib/process-services/src/lib/form/form.module.ts
@@ -32,13 +32,13 @@ import { TypeaheadWidgetComponent } from './widgets/typeahead/typeahead.widget';
 import { DropdownWidgetComponent } from './widgets/dropdown/dropdown.widget';
 import { DynamicTableModule } from './widgets/dynamic-table/dynamic-table.module';
 import { FileViewerWidgetComponent } from './widgets/file-viewer/file-viewer.widget';
-import { ContentModule } from '@alfresco/adf-content-services';
+import { AlfrescoViewerModule } from '@alfresco/adf-content-services';
 
 @NgModule({
     imports: [
         DynamicTableModule,
         CoreModule,
-        ContentModule,
+        AlfrescoViewerModule,
         MaterialModule
     ],
     declarations: [