diff --git a/lib/content-services/src/lib/common/services/rendition.service.ts b/lib/content-services/src/lib/common/services/rendition.service.ts
index 0169515a83..bcdf8b244d 100644
--- a/lib/content-services/src/lib/common/services/rendition.service.ts
+++ b/lib/content-services/src/lib/common/services/rendition.service.ts
@@ -17,7 +17,8 @@
 
 import { Injectable } from '@angular/core';
 import { ContentApi, RenditionEntry, RenditionPaging, RenditionsApi, VersionsApi } from '@alfresco/js-api';
-import { Track, TranslationService, ViewUtilService } from '@alfresco/adf-core';
+import { TranslationService } from '@alfresco/adf-core';
+import { Track, ViewUtilService } from '@alfresco/adf-core/viewer';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 
 @Injectable({
diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
index 4af5d38658..c954b14303 100644
--- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
+++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
@@ -42,7 +42,7 @@ import {
     ViewerToolbarActionsComponent,
     ViewerToolbarComponent,
     ViewUtilService
-} from '@alfresco/adf-core';
+} from '@alfresco/adf-core/viewer';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { ContentApi, Node, NodeEntry, NodesApi, RenditionEntry, SharedlinksApi, Version, VersionEntry, VersionsApi } from '@alfresco/js-api';
 import { RenditionService } from '../../common/services/rendition.service';
diff --git a/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts
index d67ee63038..b8404b369c 100644
--- a/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts
+++ b/lib/core/viewer/src/widgets/base-viewer/base-viewer.widget.ts
@@ -18,8 +18,8 @@
 import { NgIf } from '@angular/common';
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { ViewerComponent } from '@alfresco/adf-core/viewer';
 import { FormService, ErrorWidgetComponent, WidgetComponent } from '@alfresco/adf-core';
+import { ViewerComponent } from '../../components/viewer.component';
 
 /* eslint-disable @angular-eslint/component-selector */
 
diff --git a/lib/process-services-cloud/src/lib/form/components/cloud-form-rendering.service.ts b/lib/process-services-cloud/src/lib/form/components/cloud-form-rendering.service.ts
index 4991ce596d..c9975185e1 100644
--- a/lib/process-services-cloud/src/lib/form/components/cloud-form-rendering.service.ts
+++ b/lib/process-services-cloud/src/lib/form/components/cloud-form-rendering.service.ts
@@ -28,6 +28,7 @@ import { FileViewerWidgetComponent } from './widgets/file-viewer/file-viewer.wid
 import { DisplayRichTextWidgetComponent } from './widgets/display-rich-text/display-rich-text.widget';
 import { DataTableWidgetComponent } from './widgets/data-table/data-table.widget';
 import { DisplayExternalPropertyWidgetComponent } from './widgets/display-external-property/display-external-property.widget';
+import { BaseViewerWidgetComponent } from '@alfresco/adf-core/viewer';
 
 @Injectable({
     providedIn: 'root'
@@ -38,6 +39,7 @@ export class CloudFormRenderingService extends FormRenderingService {
 
         this.register(
             {
+                [FormFieldTypes.VIEWER]: () => BaseViewerWidgetComponent,
                 [FormFieldTypes.UPLOAD]: () => AttachFileCloudWidgetComponent,
                 [FormFieldTypes.DROPDOWN]: () => DropdownCloudWidgetComponent,
                 [FormFieldTypes.DATE]: () => DateCloudWidgetComponent,
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts
index 1d411e317d..b4ffe20d97 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts
@@ -16,7 +16,8 @@
  */
 
 import { Component, ViewEncapsulation } from '@angular/core';
-import { FormService, BaseViewerWidgetComponent, ErrorWidgetComponent } from '@alfresco/adf-core';
+import { FormService, ErrorWidgetComponent } from '@alfresco/adf-core';
+import { BaseViewerWidgetComponent } from '@alfresco/adf-core/viewer';
 import { AlfrescoViewerComponent } from '@alfresco/adf-content-services';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgIf } from '@angular/common';
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts
index e1330e45a3..a5a8d094b4 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts
@@ -16,7 +16,8 @@
  */
 
 import { Component, EventEmitter, Output, ViewEncapsulation } from '@angular/core';
-import { BaseViewerWidgetComponent, ErrorWidgetComponent, FormService } from '@alfresco/adf-core';
+import { ErrorWidgetComponent, FormService } from '@alfresco/adf-core';
+import { BaseViewerWidgetComponent } from '@alfresco/adf-core/viewer';
 import { Node } from '@alfresco/js-api';
 import { PropertiesViewerWrapperComponent } from './properties-viewer-wrapper/properties-viewer-wrapper.component';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/lib/process-services-cloud/tsconfig.lib.json b/lib/process-services-cloud/tsconfig.lib.json
index a9878d0d29..3c9ae80be9 100644
--- a/lib/process-services-cloud/tsconfig.lib.json
+++ b/lib/process-services-cloud/tsconfig.lib.json
@@ -10,6 +10,7 @@
       "@alfresco/adf-extensions/*": ["../../../dist/libs/extensions/*"],
       "@alfresco/adf-core": ["../../../dist/libs/core"],
       "@alfresco/adf-core/*": ["../../../dist/libs/core/*"],
+      "@alfresco/adf-core/viewer": ["../../../dist/libs/core/viewer"],
       "@alfresco/adf-content-services": ["../../../dist/libs/content-services"],
       "@alfresco/adf-content-services/*": ["../../../dist/libs/content-services/*"],
       "@alfresco/js-api": ["../../../dist/libs/js-api"],
diff --git a/lib/process-services/src/lib/form/process-form-rendering.service.ts b/lib/process-services/src/lib/form/process-form-rendering.service.ts
index 240cf17904..9f8d603c54 100644
--- a/lib/process-services/src/lib/form/process-form-rendering.service.ts
+++ b/lib/process-services/src/lib/form/process-form-rendering.service.ts
@@ -16,10 +16,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import {
-    FormFieldTypes,
-    FormRenderingService
-} from '@alfresco/adf-core';
+import { FormFieldTypes, FormRenderingService } from '@alfresco/adf-core';
+import { BaseViewerWidgetComponent } from '@alfresco/adf-core/viewer';
 import { AttachFileWidgetComponent } from './widgets/content-widget/attach-file-widget.component';
 import { AttachFolderWidgetComponent } from './widgets/content-widget/attach-folder-widget.component';
 import { DocumentWidgetComponent } from './widgets/document/document.widget';
@@ -38,17 +36,21 @@ export class ProcessFormRenderingService extends FormRenderingService {
     constructor() {
         super();
 
-        this.register({
-            [FormFieldTypes.DROPDOWN]: () => DropdownWidgetComponent,
-            [FormFieldTypes.TYPEAHEAD]: () =>  TypeaheadWidgetComponent,
-            [FormFieldTypes.RADIO_BUTTONS]: () =>  RadioButtonsWidgetComponent,
-            [FormFieldTypes.UPLOAD]: () => AttachFileWidgetComponent,
-            [FormFieldTypes.ATTACH_FOLDER]: () => AttachFolderWidgetComponent,
-            [FormFieldTypes.DOCUMENT]: () => DocumentWidgetComponent,
-            [FormFieldTypes.PEOPLE]: () =>  PeopleWidgetComponent,
-            [FormFieldTypes.FUNCTIONAL_GROUP]:  () => FunctionalGroupWidgetComponent,
-            [FormFieldTypes.DYNAMIC_TABLE]:  () => DynamicTableWidgetComponent,
-            [FormFieldTypes.ALFRESCO_FILE_VIEWER]:  () => FileViewerWidgetComponent
-        }, true);
+        this.register(
+            {
+                [FormFieldTypes.VIEWER]: () => BaseViewerWidgetComponent,
+                [FormFieldTypes.DROPDOWN]: () => DropdownWidgetComponent,
+                [FormFieldTypes.TYPEAHEAD]: () => TypeaheadWidgetComponent,
+                [FormFieldTypes.RADIO_BUTTONS]: () => RadioButtonsWidgetComponent,
+                [FormFieldTypes.UPLOAD]: () => AttachFileWidgetComponent,
+                [FormFieldTypes.ATTACH_FOLDER]: () => AttachFolderWidgetComponent,
+                [FormFieldTypes.DOCUMENT]: () => DocumentWidgetComponent,
+                [FormFieldTypes.PEOPLE]: () => PeopleWidgetComponent,
+                [FormFieldTypes.FUNCTIONAL_GROUP]: () => FunctionalGroupWidgetComponent,
+                [FormFieldTypes.DYNAMIC_TABLE]: () => DynamicTableWidgetComponent,
+                [FormFieldTypes.ALFRESCO_FILE_VIEWER]: () => FileViewerWidgetComponent
+            },
+            true
+        );
     }
 }
diff --git a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts
index 6128effb0c..16a72f5621 100644
--- a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts
+++ b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import { BaseViewerWidgetComponent, ErrorWidgetComponent, FormService } from '@alfresco/adf-core';
+import { ErrorWidgetComponent, FormService } from '@alfresco/adf-core';
+import { BaseViewerWidgetComponent } from '@alfresco/adf-core/viewer';
 import { Component, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/lib/process-services/tsconfig.lib.json b/lib/process-services/tsconfig.lib.json
index 6cace1e66b..967adde203 100644
--- a/lib/process-services/tsconfig.lib.json
+++ b/lib/process-services/tsconfig.lib.json
@@ -9,6 +9,7 @@
       "@alfresco/adf-extensions/*": ["../../../dist/libs/extensions/*"],
       "@alfresco/adf-core": ["../../../dist/libs/core"],
       "@alfresco/adf-core/*": ["../../../dist/libs/core/*"],
+      "@alfresco/adf-core/viewer": ["../../../dist/libs/core/viewer"],
       "@alfresco/adf-content-services": ["../../../dist/libs/content-services"],
       "@alfresco/adf-content-services/*": ["../../../dist/libs/content-services/*"],
       "@alfresco/js-api": ["../../../dist/libs/js-api"],