diff --git a/lib/content-services/content-metadata/services/basic-properties.service.ts b/lib/content-services/content-metadata/services/basic-properties.service.ts
index d4389af92e..59a3af0a4c 100644
--- a/lib/content-services/content-metadata/services/basic-properties.service.ts
+++ b/lib/content-services/content-metadata/services/basic-properties.service.ts
@@ -19,7 +19,9 @@ import { Injectable } from '@angular/core';
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { CardViewDateItemModel, CardViewTextItemModel, FileSizePipe } from '@alfresco/adf-core';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class BasicPropertiesService {
 
     constructor(private fileSizePipe: FileSizePipe) {
diff --git a/lib/content-services/content-metadata/services/config/content-metadata-config.factory.ts b/lib/content-services/content-metadata/services/config/content-metadata-config.factory.ts
index 793054a83b..08ad1e86e6 100644
--- a/lib/content-services/content-metadata/services/config/content-metadata-config.factory.ts
+++ b/lib/content-services/content-metadata/services/config/content-metadata-config.factory.ts
@@ -28,7 +28,9 @@ import {
     LayoutOrientedConfig
 } from '../../interfaces/content-metadata.interfaces';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContentMetadataConfigFactory {
 
     static readonly INDIFFERENT_PRESET = '*';
diff --git a/lib/content-services/content-metadata/services/content-metadata.service.ts b/lib/content-services/content-metadata/services/content-metadata.service.ts
index 27f715070b..8b181975e1 100644
--- a/lib/content-services/content-metadata/services/content-metadata.service.ts
+++ b/lib/content-services/content-metadata/services/content-metadata.service.ts
@@ -26,7 +26,9 @@ import { ContentMetadataConfigFactory } from './config/content-metadata-config.f
 import { PropertyDescriptorsService } from './property-descriptors.service';
 import { map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContentMetadataService {
 
     constructor(private basicPropertiesService: BasicPropertiesService,
diff --git a/lib/content-services/content-metadata/services/property-descriptors.service.ts b/lib/content-services/content-metadata/services/property-descriptors.service.ts
index 69a12d8406..834cbe0f5a 100644
--- a/lib/content-services/content-metadata/services/property-descriptors.service.ts
+++ b/lib/content-services/content-metadata/services/property-descriptors.service.ts
@@ -21,7 +21,9 @@ import { Observable, defer, forkJoin } from 'rxjs';
 import { PropertyGroup, PropertyGroupContainer } from '../interfaces/content-metadata.interfaces';
 import { map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class PropertyDescriptorsService {
 
     constructor(private alfrescoApiService: AlfrescoApiService) {}
diff --git a/lib/content-services/content-metadata/services/property-groups-translator.service.ts b/lib/content-services/content-metadata/services/property-groups-translator.service.ts
index 15a2b48959..c692985540 100644
--- a/lib/content-services/content-metadata/services/property-groups-translator.service.ts
+++ b/lib/content-services/content-metadata/services/property-groups-translator.service.ts
@@ -39,7 +39,9 @@ const D_FLOAT = 'd:float';
 const D_DOUBLE = 'd:double';
 const D_BOOLEAN = 'd:boolean';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class PropertyGroupTranslatorService {
 
     static readonly RECOGNISED_ECM_TYPES = [ D_TEXT, D_MLTEXT, D_DATE, D_DATETIME, D_INT, D_LONG , D_FLOAT, D_DOUBLE, D_BOOLEAN ];
diff --git a/lib/content-services/content-node-selector/content-node-dialog.service.ts b/lib/content-services/content-node-selector/content-node-dialog.service.ts
index 95a7e3cc54..8c4049548a 100644
--- a/lib/content-services/content-node-selector/content-node-dialog.service.ts
+++ b/lib/content-services/content-node-selector/content-node-dialog.service.ts
@@ -28,7 +28,9 @@ import { ContentNodeSelectorComponentData } from './content-node-selector.compon
 import { NodeLockDialogComponent } from '../dialogs/node-lock.dialog';
 import { switchMap } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContentNodeDialogService {
 
     /** Emitted when an error occurs. */
diff --git a/lib/content-services/content-node-selector/content-node-selector.service.ts b/lib/content-services/content-node-selector/content-node-selector.service.ts
index 76784306cb..632b43b243 100644
--- a/lib/content-services/content-node-selector/content-node-selector.service.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.service.ts
@@ -23,7 +23,9 @@ import { Observable } from 'rxjs';
 /**
  * Internal service used by ContentNodeSelector component.
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContentNodeSelectorService {
 
     constructor(private searchService: SearchService) {
diff --git a/lib/content-services/content.module.ts b/lib/content-services/content.module.ts
index 10e0494944..78d8967c9d 100644
--- a/lib/content-services/content.module.ts
+++ b/lib/content-services/content.module.ts
@@ -38,47 +38,6 @@ import { DialogModule } from './dialogs/dialog.module';
 import { FolderDirectiveModule } from './folder-directive/folder-directive.module';
 import { ContentMetadataModule } from './content-metadata/content-metadata.module';
 import { PermissionManagerModule } from './permission-manager/permission-manager.module';
-import { RatingService } from './social/services/rating.service';
-import { ContentMetadataService } from './content-metadata/services/content-metadata.service';
-import { PropertyDescriptorsService } from './content-metadata/services/property-descriptors.service';
-import { ContentMetadataConfigFactory } from './content-metadata/services/config/content-metadata-config.factory';
-import { BasicPropertiesService } from './content-metadata/services/basic-properties.service';
-import { PropertyGroupTranslatorService } from './content-metadata/services/property-groups-translator.service';
-import { SearchQueryBuilderService } from './search/search-query-builder.service';
-import { SearchFilterService } from './search/components/search-filter/search-filter.service';
-import { ContentNodeSelectorService } from './content-node-selector/content-node-selector.service';
-import { ContentNodeDialogService } from './content-node-selector/content-node-dialog.service';
-import { DocumentListService } from './document-list/services/document-list.service';
-import { FolderActionsService } from './document-list/services/folder-actions.service';
-import { DocumentActionsService } from './document-list/services/document-actions.service';
-import { NodeActionsService } from './document-list/services/node-actions.service';
-import { CustomResourcesService } from './document-list/services/custom-resources.service';
-import { NodePermissionDialogService } from './permission-manager/services/node-permission-dialog.service';
-import { NodePermissionService } from './permission-manager/services/node-permission.service';
-import { TagService } from './tag/services/tag.service';
-
-export function providers() {
-    return [
-        RatingService,
-        ContentMetadataService,
-        PropertyDescriptorsService,
-        ContentMetadataConfigFactory,
-        BasicPropertiesService,
-        PropertyGroupTranslatorService,
-        SearchQueryBuilderService,
-        SearchFilterService,
-        ContentNodeSelectorService,
-        ContentNodeDialogService,
-        DocumentListService,
-        FolderActionsService,
-        DocumentActionsService,
-        NodeActionsService,
-        CustomResourcesService,
-        NodePermissionDialogService,
-        NodePermissionService,
-        TagService
-    ];
-}
 
 @NgModule({
     imports: [
@@ -150,7 +109,6 @@ export class ContentModuleLazy {}
         VersionManagerModule
     ],
     providers: [
-        ...providers(),
         {
             provide: TRANSLATION_PROVIDER,
             multi: true,
@@ -184,7 +142,6 @@ export class ContentModule {
         return {
             ngModule: ContentModule,
             providers: [
-                ...providers(),
                 {
                     provide: TRANSLATION_PROVIDER,
                     multi: true,
diff --git a/lib/content-services/document-list/services/custom-resources.service.ts b/lib/content-services/document-list/services/custom-resources.service.ts
index ffb5f30fc0..9443391bdb 100644
--- a/lib/content-services/document-list/services/custom-resources.service.ts
+++ b/lib/content-services/document-list/services/custom-resources.service.ts
@@ -32,7 +32,9 @@ import { Injectable } from '@angular/core';
 import { Observable, from, of, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CustomResourcesService {
 
     private CREATE_PERMISSION = 'create';
diff --git a/lib/content-services/document-list/services/document-actions.service.ts b/lib/content-services/document-list/services/document-actions.service.ts
index bf5763a243..b7687058cf 100644
--- a/lib/content-services/document-list/services/document-actions.service.ts
+++ b/lib/content-services/document-list/services/document-actions.service.ts
@@ -25,7 +25,9 @@ import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
 import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class DocumentActionsService {
 
     permissionEvent: Subject<PermissionModel> = new Subject<PermissionModel>();
diff --git a/lib/content-services/document-list/services/document-list.service.ts b/lib/content-services/document-list/services/document-list.service.ts
index 248ccc4724..3a33f59eb6 100644
--- a/lib/content-services/document-list/services/document-list.service.ts
+++ b/lib/content-services/document-list/services/document-list.service.ts
@@ -25,7 +25,9 @@ import { MinimalNodeEntity, MinimalNodeEntryEntity,  NodeEntry, NodePaging } fro
 import { Observable, from, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class DocumentListService {
 
     static ROOT_ID = '-root-';
diff --git a/lib/content-services/document-list/services/folder-actions.service.ts b/lib/content-services/document-list/services/folder-actions.service.ts
index 2afd454175..89c8121a85 100644
--- a/lib/content-services/document-list/services/folder-actions.service.ts
+++ b/lib/content-services/document-list/services/folder-actions.service.ts
@@ -24,7 +24,9 @@ import { PermissionModel } from '../models/permissions.model';
 import { DocumentListService } from './document-list.service';
 import { NodeActionsService } from './node-actions.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class FolderActionsService {
 
     permissionEvent: Subject<PermissionModel> = new Subject<PermissionModel>();
diff --git a/lib/content-services/document-list/services/node-actions.service.ts b/lib/content-services/document-list/services/node-actions.service.ts
index 425a41d59c..40bc084818 100644
--- a/lib/content-services/document-list/services/node-actions.service.ts
+++ b/lib/content-services/document-list/services/node-actions.service.ts
@@ -25,7 +25,9 @@ import { DocumentListService } from './document-list.service';
 import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
 import { NodeDownloadDirective } from '../../directives/node-download.directive';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NodeActionsService {
 
     @Output()
diff --git a/lib/content-services/permission-manager/services/node-permission-dialog.service.ts b/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
index 5afdf0ded8..c351b27cbe 100644
--- a/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
+++ b/lib/content-services/permission-manager/services/node-permission-dialog.service.ts
@@ -25,7 +25,9 @@ import { NodePermissionService } from './node-permission.service';
 import { ContentService, PermissionsEnum } from '@alfresco/adf-core';
 import { switchMap } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NodePermissionDialogService {
 
     constructor(private dialog: MatDialog,
diff --git a/lib/content-services/permission-manager/services/node-permission.service.ts b/lib/content-services/permission-manager/services/node-permission.service.ts
index 943db0be9f..9f12d23b17 100644
--- a/lib/content-services/permission-manager/services/node-permission.service.ts
+++ b/lib/content-services/permission-manager/services/node-permission.service.ts
@@ -21,7 +21,9 @@ import { AlfrescoApiService, SearchService, NodesApiService, TranslationService
 import { QueryBody, MinimalNodeEntryEntity, MinimalNodeEntity, PathElement, GroupMemberEntry, GroupsPaging, GroupMemberPaging, PermissionElement } from 'alfresco-js-api';
 import { switchMap, map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NodePermissionService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/content-services/search/components/search-filter/search-filter.service.ts b/lib/content-services/search/components/search-filter/search-filter.service.ts
index 57fe9fda88..f90920ff70 100644
--- a/lib/content-services/search/components/search-filter/search-filter.service.ts
+++ b/lib/content-services/search/components/search-filter/search-filter.service.ts
@@ -23,7 +23,9 @@ import { SearchNumberRangeComponent } from '../search-number-range/search-number
 import { SearchCheckListComponent } from '../search-check-list/search-check-list.component';
 import { SearchDateRangeComponent } from '../search-date-range/search-date-range.component';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SearchFilterService {
 
     /**
diff --git a/lib/content-services/search/search-query-builder.service.ts b/lib/content-services/search/search-query-builder.service.ts
index 41306c6795..ee07297c68 100644
--- a/lib/content-services/search/search-query-builder.service.ts
+++ b/lib/content-services/search/search-query-builder.service.ts
@@ -28,7 +28,9 @@ import { SearchSortingDefinition } from './search-sorting-definition.interface';
 import { FacetField } from './facet-field.interface';
 import { FacetFieldBucket } from './facet-field-bucket.interface';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SearchQueryBuilderService {
 
     private _userQuery = '';
diff --git a/lib/content-services/social/services/rating.service.ts b/lib/content-services/social/services/rating.service.ts
index f24993bbb1..c0bb8522ce 100644
--- a/lib/content-services/social/services/rating.service.ts
+++ b/lib/content-services/social/services/rating.service.ts
@@ -22,7 +22,9 @@ import { RatingBody } from 'alfresco-js-api';
 import { from, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class RatingService {
 
     constructor(private apiService: AlfrescoApiService) {
diff --git a/lib/content-services/tag/services/tag.service.ts b/lib/content-services/tag/services/tag.service.ts
index 72bd52ba46..43c13ee9f1 100644
--- a/lib/content-services/tag/services/tag.service.ts
+++ b/lib/content-services/tag/services/tag.service.ts
@@ -21,7 +21,9 @@ import { Observable, from, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { TagPaging } from 'alfresco-js-api';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TagService {
 
     /** Emitted when tag information is updated. */
diff --git a/lib/core/app-config/app-config.service.ts b/lib/core/app-config/app-config.service.ts
index 6b5992691e..cd751c5784 100644
--- a/lib/core/app-config/app-config.service.ts
+++ b/lib/core/app-config/app-config.service.ts
@@ -37,7 +37,9 @@ export enum AppConfigValues {
     DISABLECSRF = 'disableCSRF'
 }
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AppConfigService {
 
     config: any = {
diff --git a/lib/core/card-view/services/card-item-types.service.ts b/lib/core/card-view/services/card-item-types.service.ts
index 713d729b30..53d42bc4b6 100644
--- a/lib/core/card-view/services/card-item-types.service.ts
+++ b/lib/core/card-view/services/card-item-types.service.ts
@@ -24,7 +24,9 @@ import { CardViewBoolItemComponent } from '../components/card-view-boolitem/card
 import { CardViewKeyValuePairsItemComponent } from '../components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
 import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CardItemTypeService extends DynamicComponentMapper {
 
     protected defaultValue: Type<{}> = CardViewTextItemComponent;
diff --git a/lib/core/card-view/services/card-view-update.service.ts b/lib/core/card-view/services/card-view-update.service.ts
index 245e940fe7..cea37bb28f 100644
--- a/lib/core/card-view/services/card-view-update.service.ts
+++ b/lib/core/card-view/services/card-view-update.service.ts
@@ -36,7 +36,9 @@ export function transformKeyToObject(key: string, value): Object {
     }, value);
 }
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CardViewUpdateService {
 
     // Observable sources
diff --git a/lib/core/context-menu/context-menu-overlay.service.ts b/lib/core/context-menu/context-menu-overlay.service.ts
index fb1641eca6..f92d8b88df 100644
--- a/lib/core/context-menu/context-menu-overlay.service.ts
+++ b/lib/core/context-menu/context-menu-overlay.service.ts
@@ -29,7 +29,9 @@ const DEFAULT_CONFIG: ContextMenuOverlayConfig = {
     hasBackdrop: true
 };
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContextMenuOverlayService {
 
     constructor( private injector: Injector, private overlay: Overlay) { }
diff --git a/lib/core/context-menu/context-menu.service.ts b/lib/core/context-menu/context-menu.service.ts
index 871dc89d6b..a3f93cdb17 100644
--- a/lib/core/context-menu/context-menu.service.ts
+++ b/lib/core/context-menu/context-menu.service.ts
@@ -18,7 +18,9 @@
 import { Injectable } from '@angular/core';
 import { Subject } from 'rxjs';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContextMenuService {
     public show: Subject<{event: MouseEvent, obj: any[]}> = new Subject<{event: MouseEvent, obj: any[]}>();
 }
diff --git a/lib/core/core.module.ts b/lib/core/core.module.ts
index 68034226f2..9a3b0b1058 100644
--- a/lib/core/core.module.ts
+++ b/lib/core/core.module.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { CommonModule, DatePipe } from '@angular/common';
+import { CommonModule } from '@angular/common';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 
 import { APP_INITIALIZER, NgModule, ModuleWithProviders } from '@angular/core';
@@ -49,116 +49,16 @@ import { DirectiveModule } from './directives/directive.module';
 import { PipeModule } from './pipes/pipe.module';
 
 import { AlfrescoApiService } from './services/alfresco-api.service';
-import { AppsProcessService } from './services/apps-process.service';
-import { AuthGuardBpm } from './services/auth-guard-bpm.service';
-import { AuthGuardEcm } from './services/auth-guard-ecm.service';
-import { AuthGuard } from './services/auth-guard.service';
-import { AuthenticationService } from './services/authentication.service';
-import { CardItemTypeService } from './card-view/services/card-item-types.service';
-import { CardViewUpdateService } from './card-view/services/card-view-update.service';
-import { CommentProcessService } from './services/comment-process.service';
-import { CommentContentService } from './services/comment-content.service';
-import { ContentService } from './services/content.service';
-import { CookieService } from './services/cookie.service';
-import { DeletedNodesApiService } from './services/deleted-nodes-api.service';
-import { DiscoveryApiService } from './services/discovery-api.service';
-import { FavoritesApiService } from './services/favorites-api.service';
-import { HighlightTransformService } from './services/highlight-transform.service';
 import { LogService } from './services/log.service';
-import { NodesApiService } from './services/nodes-api.service';
-import { NotificationService } from './services/notification.service';
-import { PageTitleService } from './services/page-title.service';
-import { PeopleContentService } from './services/people-content.service';
-import { PeopleProcessService } from './services/people-process.service';
-import { RenditionsService } from './services/renditions.service';
-import { SearchService } from './services/search.service';
-import { SettingsService } from './services/settings.service';
-import { SharedLinksApiService } from './services/shared-links-api.service';
-import { SitesService } from './services/sites.service';
-import { StorageService } from './services/storage.service';
-import { ThumbnailService } from './services/thumbnail.service';
 import { TranslateLoaderService } from './services/translate-loader.service';
 import { TranslationService } from './services/translation.service';
-import { UploadService } from './services/upload.service';
-import { UserPreferencesService } from './services/user-preferences.service';
-import { SearchConfigurationService } from './services/search-configuration.service';
 import { startupServiceFactory } from './services/startup-service-factory';
 import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
-import { AppConfigService } from './app-config/app-config.service';
-import { ContextMenuService } from './context-menu/context-menu.service';
-import { ContextMenuOverlayService } from './context-menu/context-menu-overlay.service';
-import { ActivitiContentService } from './form/services/activiti-alfresco.service';
-import { EcmModelService } from './form/services/ecm-model.service';
-import { FormRenderingService } from './form/services/form-rendering.service';
-import { FormService } from './form/services/form.service';
-import { NodeService } from './form/services/node.service';
-import { ProcessContentService } from './form/services/process-content.service';
-import { WidgetVisibilityService } from './form/services/widget-visibility.service';
-import { EcmUserService } from './userinfo/services/ecm-user.service';
-import { BpmUserService } from './userinfo/services/bpm-user.service';
-import { ViewUtilService } from './viewer/services/view-util.service';
-import { LoginDialogService } from './services/login-dialog.service';
-import { ExternalAlfrescoApiService } from './services/external-alfresco-api.service';
 
 export function createTranslateLoader(http: HttpClient) {
     return new TranslateLoaderService(http);
 }
 
-export function providers() {
-    return [
-        AuthenticationService,
-        AlfrescoApiService,
-        SettingsService,
-        ContentService,
-        AuthGuard,
-        AuthGuardEcm,
-        AuthGuardBpm,
-        AppsProcessService,
-        PageTitleService,
-        StorageService,
-        CookieService,
-        RenditionsService,
-        NotificationService,
-        LogService,
-        TranslationService,
-        TranslateLoaderService,
-        ThumbnailService,
-        UploadService,
-        CardItemTypeService,
-        CardViewUpdateService,
-        UserPreferencesService,
-        HighlightTransformService,
-        DeletedNodesApiService,
-        FavoritesApiService,
-        NodesApiService,
-        PeopleContentService,
-        PeopleProcessService,
-        SearchService,
-        SharedLinksApiService,
-        SitesService,
-        DiscoveryApiService,
-        CommentProcessService,
-        CommentContentService,
-        SearchConfigurationService,
-        DatePipe,
-        AppConfigService,
-        ContextMenuService,
-        ContextMenuOverlayService,
-        ActivitiContentService,
-        EcmModelService,
-        FormRenderingService,
-        FormService,
-        NodeService,
-        ProcessContentService,
-        WidgetVisibilityService,
-        EcmUserService,
-        BpmUserService,
-        ViewUtilService,
-        LoginDialogService,
-        ExternalAlfrescoApiService
-    ];
-}
-
 @NgModule({
     imports: [
         AboutModule,
@@ -305,7 +205,6 @@ export class CoreModuleLazy {
         SortingPickerModule
     ],
     providers: [
-        ...providers(),
         {
             provide: APP_INITIALIZER,
             useFactory: startupServiceFactory,
@@ -321,7 +220,6 @@ export class CoreModule {
         return {
             ngModule: CoreModule,
             providers: [
-                ...providers(),
                 {
                     provide: APP_INITIALIZER,
                     useFactory: startupServiceFactory,
diff --git a/lib/core/form/services/activiti-alfresco.service.ts b/lib/core/form/services/activiti-alfresco.service.ts
index 66098cfef4..27180af5ec 100644
--- a/lib/core/form/services/activiti-alfresco.service.ts
+++ b/lib/core/form/services/activiti-alfresco.service.ts
@@ -24,7 +24,9 @@ import { ExternalContent } from '../components/widgets/core/external-content';
 import { ExternalContentLink } from '../components/widgets/core/external-content-link';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ActivitiContentService {
 
     static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error';
diff --git a/lib/core/form/services/ecm-model.service.ts b/lib/core/form/services/ecm-model.service.ts
index d8407d7b15..62b7a9300b 100644
--- a/lib/core/form/services/ecm-model.service.ts
+++ b/lib/core/form/services/ecm-model.service.ts
@@ -22,7 +22,9 @@ import { Observable, from } from 'rxjs';
 import { FormModel } from '../components/widgets/core/form.model';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class EcmModelService {
 
     public static MODEL_NAMESPACE: string = 'activitiForms';
diff --git a/lib/core/form/services/form-rendering.service.ts b/lib/core/form/services/form-rendering.service.ts
index dd6ef74216..a3ac6e74cb 100644
--- a/lib/core/form/services/form-rendering.service.ts
+++ b/lib/core/form/services/form-rendering.service.ts
@@ -40,7 +40,9 @@ import {
     DateTimeWidgetComponent
 } from './../components/widgets/index';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class FormRenderingService extends DynamicComponentMapper {
 
     protected defaultValue: Type<{}> = UnknownWidgetComponent;
diff --git a/lib/core/form/services/form.service.ts b/lib/core/form/services/form.service.ts
index cd68485069..c4cfd26149 100644
--- a/lib/core/form/services/form.service.ts
+++ b/lib/core/form/services/form.service.ts
@@ -31,7 +31,9 @@ import {
 import { EcmModelService } from './ecm-model.service';
 import { map, catchError, switchMap, combineAll, defaultIfEmpty } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class FormService {
 
     static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error';
diff --git a/lib/core/form/services/node.service.ts b/lib/core/form/services/node.service.ts
index d8e445a6dc..088dd07cc8 100644
--- a/lib/core/form/services/node.service.ts
+++ b/lib/core/form/services/node.service.ts
@@ -21,7 +21,9 @@ import { Observable, from } from 'rxjs';
 import { NodeMetadata } from '../models/node-metadata.model';
 import { map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NodeService {
 
     constructor(private apiService: AlfrescoApiService) {
diff --git a/lib/core/form/services/process-content.service.ts b/lib/core/form/services/process-content.service.ts
index 870cf14888..faccff8221 100644
--- a/lib/core/form/services/process-content.service.ts
+++ b/lib/core/form/services/process-content.service.ts
@@ -22,7 +22,9 @@ import { RelatedContentRepresentation } from 'alfresco-js-api';
 import { Observable, from, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ProcessContentService {
 
     static UNKNOWN_ERROR_MESSAGE: string = 'Unknown error';
diff --git a/lib/core/form/services/widget-visibility.service.ts b/lib/core/form/services/widget-visibility.service.ts
index f0aaf43d03..c3cd7abfb3 100644
--- a/lib/core/form/services/widget-visibility.service.ts
+++ b/lib/core/form/services/widget-visibility.service.ts
@@ -25,7 +25,9 @@ import { TaskProcessVariableModel } from '../models/task-process-variable.model'
 import { WidgetVisibilityModel } from '../models/widget-visibility.model';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class WidgetVisibilityService {
 
     private processVarList: TaskProcessVariableModel[];
diff --git a/lib/core/services/alfresco-api.service.ts b/lib/core/services/alfresco-api.service.ts
index d09364663b..4a2f5c4385 100644
--- a/lib/core/services/alfresco-api.service.ts
+++ b/lib/core/services/alfresco-api.service.ts
@@ -39,7 +39,9 @@ import { OauthConfigModel } from '../models/oauth-config.model';
 
 /* tslint:disable:adf-file-name */
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AlfrescoApiService {
     /**
      * Publish/subscribe to events related to node updates.
diff --git a/lib/core/services/apps-process.service.ts b/lib/core/services/apps-process.service.ts
index 24410b2fd1..e4f518c625 100644
--- a/lib/core/services/apps-process.service.ts
+++ b/lib/core/services/apps-process.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AppsProcessService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/core/services/auth-guard-bpm.service.ts b/lib/core/services/auth-guard-bpm.service.ts
index d6845e00de..9d01230e14 100644
--- a/lib/core/services/auth-guard-bpm.service.ts
+++ b/lib/core/services/auth-guard-bpm.service.ts
@@ -21,7 +21,9 @@ import { AppConfigService, AppConfigValues } from '../app-config/app-config.serv
 import { AuthenticationService } from './authentication.service';
 import { OauthConfigModel } from '../models/oauth-config.model';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AuthGuardBpm implements CanActivate, CanActivateChild {
     constructor(private authService: AuthenticationService, private router: Router, private appConfig: AppConfigService) {}
 
diff --git a/lib/core/services/auth-guard-ecm.service.ts b/lib/core/services/auth-guard-ecm.service.ts
index 6f11133cc5..fa4a5aacdf 100644
--- a/lib/core/services/auth-guard-ecm.service.ts
+++ b/lib/core/services/auth-guard-ecm.service.ts
@@ -23,7 +23,9 @@ import { AuthenticationService } from './authentication.service';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { OauthConfigModel } from '../models/oauth-config.model';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AuthGuardEcm implements CanActivate {
     constructor(private authService: AuthenticationService,
                 private router: Router,
diff --git a/lib/core/services/auth-guard.service.ts b/lib/core/services/auth-guard.service.ts
index 776db6c398..4d0bf7e386 100644
--- a/lib/core/services/auth-guard.service.ts
+++ b/lib/core/services/auth-guard.service.ts
@@ -25,7 +25,9 @@ import { Observable } from 'rxjs';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { OauthConfigModel } from '../models/oauth-config.model';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AuthGuard implements CanActivate, CanActivateChild {
     constructor(private authService: AuthenticationService,
                 private router: Router,
diff --git a/lib/core/services/authentication.service.ts b/lib/core/services/authentication.service.ts
index ee43720473..385a3e3081 100644
--- a/lib/core/services/authentication.service.ts
+++ b/lib/core/services/authentication.service.ts
@@ -29,7 +29,9 @@ import { HttpHeaders } from '@angular/common/http';
 const REMEMBER_ME_COOKIE_KEY = 'ALFRESCO_REMEMBER_ME';
 const REMEMBER_ME_UNTIL = 1000 * 60 * 60 * 24 * 30;
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AuthenticationService {
     private redirectUrl: RedirectionModel = null;
 
diff --git a/lib/core/services/comment-content.service.ts b/lib/core/services/comment-content.service.ts
index 85c8abc7e2..a9b9abc282 100644
--- a/lib/core/services/comment-content.service.ts
+++ b/lib/core/services/comment-content.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { LogService } from '../services/log.service';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CommentContentService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/core/services/comment-process.service.ts b/lib/core/services/comment-process.service.ts
index aa1cf7b981..02c037ea26 100644
--- a/lib/core/services/comment-process.service.ts
+++ b/lib/core/services/comment-process.service.ts
@@ -23,7 +23,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CommentProcessService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/core/services/content.service.ts b/lib/core/services/content.service.ts
index 206a2d4dce..07b03f4020 100644
--- a/lib/core/services/content.service.ts
+++ b/lib/core/services/content.service.ts
@@ -26,7 +26,9 @@ import { AuthenticationService } from './authentication.service';
 import { LogService } from './log.service';
 import { catchError, tap } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ContentService {
 
     private saveData: Function;
diff --git a/lib/core/services/cookie.service.ts b/lib/core/services/cookie.service.ts
index 1f6be0f356..f0a606d66d 100644
--- a/lib/core/services/cookie.service.ts
+++ b/lib/core/services/cookie.service.ts
@@ -17,7 +17,9 @@
 
 import { Injectable } from '@angular/core';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class CookieService {
 
     /**
diff --git a/lib/core/services/deleted-nodes-api.service.ts b/lib/core/services/deleted-nodes-api.service.ts
index b529c52833..dc407a5c1c 100644
--- a/lib/core/services/deleted-nodes-api.service.ts
+++ b/lib/core/services/deleted-nodes-api.service.ts
@@ -23,7 +23,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class DeletedNodesApiService {
     constructor(
         private apiService: AlfrescoApiService,
diff --git a/lib/core/services/discovery-api.service.ts b/lib/core/services/discovery-api.service.ts
index 5cc1bc9feb..52b93495c8 100644
--- a/lib/core/services/discovery-api.service.ts
+++ b/lib/core/services/discovery-api.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { map, catchError } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class DiscoveryApiService {
 
     constructor(private apiService: AlfrescoApiService) { }
diff --git a/lib/core/services/external-alfresco-api.service.ts b/lib/core/services/external-alfresco-api.service.ts
index 616802205d..a90ad2b807 100644
--- a/lib/core/services/external-alfresco-api.service.ts
+++ b/lib/core/services/external-alfresco-api.service.ts
@@ -24,7 +24,9 @@ import {
 import * as alfrescoApi from 'alfresco-js-api';
 /* tslint:disable:adf-file-name */
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ExternalAlfrescoApiService {
 
     protected alfrescoApi: AlfrescoApi;
diff --git a/lib/core/services/favorites-api.service.ts b/lib/core/services/favorites-api.service.ts
index 93f2bdd295..290f6d8e74 100644
--- a/lib/core/services/favorites-api.service.ts
+++ b/lib/core/services/favorites-api.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class FavoritesApiService {
 
     static remapEntry({ entry }: any): any {
diff --git a/lib/core/services/highlight-transform.service.ts b/lib/core/services/highlight-transform.service.ts
index 3eb124c7b1..a39ee7cae8 100644
--- a/lib/core/services/highlight-transform.service.ts
+++ b/lib/core/services/highlight-transform.service.ts
@@ -15,11 +15,16 @@
  * limitations under the License.
  */
 
+import { Injectable } from '@angular/core';
+
 export interface HightlightTransformResult {
     text: string;
     changed: boolean;
 }
 
+@Injectable({
+    providedIn: 'root'
+})
 export class HighlightTransformService {
 
     /**
diff --git a/lib/core/services/log.service.ts b/lib/core/services/log.service.ts
index 2b6180e9b4..8494d88c8c 100644
--- a/lib/core/services/log.service.ts
+++ b/lib/core/services/log.service.ts
@@ -22,7 +22,9 @@ import { AppConfigService, AppConfigValues } from '../app-config/app-config.serv
 import { logLevels, LogLevelsEnum } from '../models/log-levels.model';
 import { Subject } from 'rxjs';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class LogService {
 
     get currentLogLevel() {
diff --git a/lib/core/services/login-dialog.service.ts b/lib/core/services/login-dialog.service.ts
index 7cc8701bce..b8ada5cc06 100644
--- a/lib/core/services/login-dialog.service.ts
+++ b/lib/core/services/login-dialog.service.ts
@@ -21,7 +21,9 @@ import { Subject, Observable } from 'rxjs';
 import { LoginDialogComponent } from '../login/components/login-dialog.component';
 import { LoginDialogComponentData } from '../login/components/login-dialog-component-data.interface';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class LoginDialogService {
 
     constructor(private dialog: MatDialog) {
diff --git a/lib/core/services/nodes-api.service.ts b/lib/core/services/nodes-api.service.ts
index da05a92a3f..aeead801a4 100644
--- a/lib/core/services/nodes-api.service.ts
+++ b/lib/core/services/nodes-api.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NodesApiService {
 
     constructor(
diff --git a/lib/core/services/notification.service.ts b/lib/core/services/notification.service.ts
index 3a0ea41f82..b1a12e0589 100644
--- a/lib/core/services/notification.service.ts
+++ b/lib/core/services/notification.service.ts
@@ -19,7 +19,9 @@ import { Injectable } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, MatSnackBarConfig } from '@angular/material';
 import { TranslationService } from './translation.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class NotificationService {
 
     static DEFAULT_DURATION_MESSAGE: number = 5000;
diff --git a/lib/core/services/page-title.service.ts b/lib/core/services/page-title.service.ts
index 7377cebd27..ffdef73181 100644
--- a/lib/core/services/page-title.service.ts
+++ b/lib/core/services/page-title.service.ts
@@ -20,7 +20,9 @@ import { Title } from '@angular/platform-browser';
 import { AppConfigService } from '../app-config/app-config.service';
 import { TranslationService } from './translation.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class PageTitleService {
 
     private originalTitle: string = '';
diff --git a/lib/core/services/people-content.service.ts b/lib/core/services/people-content.service.ts
index fc24856925..a7c99f9e47 100644
--- a/lib/core/services/people-content.service.ts
+++ b/lib/core/services/people-content.service.ts
@@ -20,7 +20,9 @@ import { Observable, from, of } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class PeopleContentService {
 
     constructor(private apiService: AlfrescoApiService) {}
diff --git a/lib/core/services/people-process.service.ts b/lib/core/services/people-process.service.ts
index 5cddf25d56..61c19b997d 100644
--- a/lib/core/services/people-process.service.ts
+++ b/lib/core/services/people-process.service.ts
@@ -23,7 +23,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { LogService } from './log.service';
 import { catchError, map } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class PeopleProcessService {
 
     constructor(private alfrescoJsApi: AlfrescoApiService,
diff --git a/lib/core/services/renditions.service.ts b/lib/core/services/renditions.service.ts
index 97369f4876..8a640bb9a4 100644
--- a/lib/core/services/renditions.service.ts
+++ b/lib/core/services/renditions.service.ts
@@ -26,7 +26,9 @@ import { concatMap, switchMap, takeWhile } from 'rxjs/operators';
  * RenditionsService
  * (this service is deprecated in 2.2.0 and will be removed in future revisions)
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class RenditionsService {
 
     constructor(private apiService: AlfrescoApiService) {
diff --git a/lib/core/services/search-configuration.service.ts b/lib/core/services/search-configuration.service.ts
index ea55547563..60ea71a89c 100644
--- a/lib/core/services/search-configuration.service.ts
+++ b/lib/core/services/search-configuration.service.ts
@@ -19,7 +19,9 @@ import { Injectable } from '@angular/core';
 import { QueryBody } from 'alfresco-js-api';
 import { SearchConfigurationInterface } from '../interface/search-configuration.interface';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SearchConfigurationService implements SearchConfigurationInterface {
 
     constructor() {
diff --git a/lib/core/services/search.service.ts b/lib/core/services/search.service.ts
index 453b873cd8..d8455b7b7e 100644
--- a/lib/core/services/search.service.ts
+++ b/lib/core/services/search.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { SearchConfigurationService } from './search-configuration.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SearchService {
 
     dataLoaded: Subject<NodePaging> = new Subject();
diff --git a/lib/core/services/settings.service.ts b/lib/core/services/settings.service.ts
index 531124a048..780066667a 100644
--- a/lib/core/services/settings.service.ts
+++ b/lib/core/services/settings.service.ts
@@ -20,7 +20,9 @@ import { AppConfigService, AppConfigValues } from '../app-config/app-config.serv
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SettingsService {
 
     constructor(private appConfig: AppConfigService,
diff --git a/lib/core/services/shared-links-api.service.ts b/lib/core/services/shared-links-api.service.ts
index c19eeae1d1..c5596fa4b3 100644
--- a/lib/core/services/shared-links-api.service.ts
+++ b/lib/core/services/shared-links-api.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { UserPreferencesService } from './user-preferences.service';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SharedLinksApiService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/core/services/sites.service.ts b/lib/core/services/sites.service.ts
index 8245c55ad4..fcd31ccecf 100644
--- a/lib/core/services/sites.service.ts
+++ b/lib/core/services/sites.service.ts
@@ -22,7 +22,9 @@ import { AlfrescoApiService } from './alfresco-api.service';
 import { SitePaging, SiteEntry } from 'alfresco-js-api';
 import { catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class SitesService {
 
     constructor(
diff --git a/lib/core/services/storage.service.ts b/lib/core/services/storage.service.ts
index 1f9f532130..85ecd14108 100644
--- a/lib/core/services/storage.service.ts
+++ b/lib/core/services/storage.service.ts
@@ -17,7 +17,9 @@
 
 import { Injectable } from '@angular/core';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class StorageService {
 
     private memoryStore: { [key: string]: any } = {};
diff --git a/lib/core/services/thumbnail.service.ts b/lib/core/services/thumbnail.service.ts
index 0b194fdc0d..8acd129012 100644
--- a/lib/core/services/thumbnail.service.ts
+++ b/lib/core/services/thumbnail.service.ts
@@ -20,7 +20,9 @@ import { MatIconRegistry } from '@angular/material';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ContentService } from './content.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ThumbnailService {
 
     DEFAULT_ICON: string = './assets/images/ft_ic_miscellaneous.svg';
diff --git a/lib/core/services/translate-loader.service.ts b/lib/core/services/translate-loader.service.ts
index 25dd26c680..62120ad132 100644
--- a/lib/core/services/translate-loader.service.ts
+++ b/lib/core/services/translate-loader.service.ts
@@ -24,7 +24,9 @@ import { ComponentTranslationModel } from '../models/component.model';
 import { ObjectUtils } from '../utils/object-utils';
 import { map, catchError, retry } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TranslateLoaderService implements TranslateLoader {
 
     private prefix: string = 'i18n';
diff --git a/lib/core/services/translation.service.spec.ts b/lib/core/services/translation.service.spec.ts
index 9c81894423..4c2e67905b 100644
--- a/lib/core/services/translation.service.spec.ts
+++ b/lib/core/services/translation.service.spec.ts
@@ -22,11 +22,8 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { TranslateLoaderService } from './translate-loader.service';
 import { TRANSLATION_PROVIDER, TranslationService } from './translation.service';
-import { LogService } from './log.service';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AppConfigServiceMock } from '../mock/app-config.service.mock';
-import { UserPreferencesService } from './user-preferences.service';
-import { StorageService } from './storage.service';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
 
@@ -49,11 +46,7 @@ describe('TranslationService', () => {
             ],
             providers: [
                 { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
-                LogService,
                 { provide: AppConfigService, useClass: AppConfigServiceMock },
-                UserPreferencesService,
-                StorageService,
-                TranslationService,
                 {
                     provide: TRANSLATION_PROVIDER,
                     multi: true,
diff --git a/lib/core/services/translation.service.ts b/lib/core/services/translation.service.ts
index b1ca4feabc..1fbc00c80e 100644
--- a/lib/core/services/translation.service.ts
+++ b/lib/core/services/translation.service.ts
@@ -28,7 +28,9 @@ export interface TranslationProvider {
     source: string;
 }
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TranslationService {
     defaultLang: string;
     userLang: string;
diff --git a/lib/core/services/upload.service.ts b/lib/core/services/upload.service.ts
index c39f169e9c..d372a961de 100644
--- a/lib/core/services/upload.service.ts
+++ b/lib/core/services/upload.service.ts
@@ -28,7 +28,9 @@ import {
 import { FileModel, FileUploadProgress, FileUploadStatus } from '../models/file.model';
 import { AlfrescoApiService } from './alfresco-api.service';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class UploadService {
 
     private cache: { [key: string]: any } = {};
diff --git a/lib/core/services/user-preferences.service.ts b/lib/core/services/user-preferences.service.ts
index d371e8d823..0cf7f2f5ac 100644
--- a/lib/core/services/user-preferences.service.ts
+++ b/lib/core/services/user-preferences.service.ts
@@ -28,7 +28,9 @@ export enum UserPreferenceValues {
     SupportedPageSizes = 'supportedPageSizes'
 }
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class UserPreferencesService {
 
     defaults = {
diff --git a/lib/core/userinfo/services/bpm-user.service.ts b/lib/core/userinfo/services/bpm-user.service.ts
index 5178cc9193..b62cea8d94 100644
--- a/lib/core/userinfo/services/bpm-user.service.ts
+++ b/lib/core/userinfo/services/bpm-user.service.ts
@@ -28,7 +28,9 @@ import { map, catchError } from 'rxjs/operators';
  * BPMUserService retrieve all the information of an Ecm user.
  *
  */
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class BpmUserService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/core/userinfo/services/ecm-user.service.ts b/lib/core/userinfo/services/ecm-user.service.ts
index 1260ff6d94..629c73c280 100644
--- a/lib/core/userinfo/services/ecm-user.service.ts
+++ b/lib/core/userinfo/services/ecm-user.service.ts
@@ -24,7 +24,9 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { LogService } from '../../services/log.service';
 import { EcmUserModel } from '../models/ecm-user.model';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class EcmUserService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.service.ts b/lib/process-services/content-widget/attach-file-widget-dialog.service.ts
index a4a0e074f4..16a39a713d 100644
--- a/lib/process-services/content-widget/attach-file-widget-dialog.service.ts
+++ b/lib/process-services/content-widget/attach-file-widget-dialog.service.ts
@@ -22,7 +22,9 @@ import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog
 import { MinimalNodeEntryEntity } from 'alfresco-js-api';
 import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class AttachFileWidgetDialogService {
 
     /** Emitted when an error occurs. */
diff --git a/lib/process-services/process-list/services/process-filter.service.ts b/lib/process-services/process-list/services/process-filter.service.ts
index a232098e48..8b9f9e88a7 100644
--- a/lib/process-services/process-list/services/process-filter.service.ts
+++ b/lib/process-services/process-list/services/process-filter.service.ts
@@ -21,7 +21,9 @@ import { Observable, from, forkJoin, throwError } from 'rxjs';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ProcessFilterService {
 
     constructor(private alfrescoApiService: AlfrescoApiService) {
diff --git a/lib/process-services/process-list/services/process.service.ts b/lib/process-services/process-list/services/process.service.ts
index fbfa031c2b..a1af905f33 100644
--- a/lib/process-services/process-list/services/process.service.ts
+++ b/lib/process-services/process-list/services/process.service.ts
@@ -28,7 +28,9 @@ import { map, catchError } from 'rxjs/operators';
 
 declare let moment: any;
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ProcessService {
 
     constructor(private alfrescoApiService: AlfrescoApiService) {
diff --git a/lib/process-services/process.module.ts b/lib/process-services/process.module.ts
index 91d4e93fdd..0b0ca94cbf 100644
--- a/lib/process-services/process.module.ts
+++ b/lib/process-services/process.module.ts
@@ -28,25 +28,6 @@ import { AppsListModule } from './app-list/apps-list.module';
 import { ProcessCommentsModule } from './process-comments/process-comments.module';
 import { AttachmentModule } from './attachment/attachment.module';
 import { PeopleModule } from './people/people.module';
-import { ProcessService } from './process-list/services/process.service';
-import { ProcessFilterService } from './process-list/services/process-filter.service';
-import { TaskListService } from './task-list/services/tasklist.service';
-import { TaskFilterService } from './task-list/services/task-filter.service';
-import { TaskUploadService } from './task-list/services/task-upload.service';
-import { ProcessUploadService } from './task-list/services/process-upload.service';
-import { AttachFileWidgetDialogService } from './content-widget/attach-file-widget-dialog.service';
-
-export function providers() {
-    return [
-        ProcessService,
-        ProcessFilterService,
-        TaskListService,
-        TaskFilterService,
-        TaskUploadService,
-        ProcessUploadService,
-        AttachFileWidgetDialogService
-    ];
-}
 
 @NgModule({
     imports: [
@@ -63,7 +44,6 @@ export function providers() {
         PeopleModule
     ],
     providers: [
-        ...providers(),
         {
             provide: TRANSLATION_PROVIDER,
             multi: true,
@@ -90,7 +70,6 @@ export class ProcessModule {
         return {
             ngModule: ProcessModule,
             providers: [
-                ...providers(),
                 {
                     provide: TRANSLATION_PROVIDER,
                     multi: true,
diff --git a/lib/process-services/task-list/services/process-upload.service.ts b/lib/process-services/task-list/services/process-upload.service.ts
index ca98de0615..51e2a83d45 100644
--- a/lib/process-services/task-list/services/process-upload.service.ts
+++ b/lib/process-services/task-list/services/process-upload.service.ts
@@ -19,7 +19,9 @@ import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/a
 import { Injectable } from '@angular/core';
 import { throwError } from 'rxjs';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class ProcessUploadService extends UploadService {
 
     constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService) {
diff --git a/lib/process-services/task-list/services/task-filter.service.ts b/lib/process-services/task-list/services/task-filter.service.ts
index 93d6ea0d6a..535f2c2a24 100644
--- a/lib/process-services/task-list/services/task-filter.service.ts
+++ b/lib/process-services/task-list/services/task-filter.service.ts
@@ -21,7 +21,9 @@ import { Observable, forkJoin, from, throwError } from 'rxjs';
 import { FilterRepresentationModel } from '../models/filter.model';
 import { map, catchError } from 'rxjs/operators';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TaskFilterService {
 
     constructor(private apiService: AlfrescoApiService,
diff --git a/lib/process-services/task-list/services/task-upload.service.ts b/lib/process-services/task-list/services/task-upload.service.ts
index 4b2a8cfc64..43fff250b2 100644
--- a/lib/process-services/task-list/services/task-upload.service.ts
+++ b/lib/process-services/task-list/services/task-upload.service.ts
@@ -19,7 +19,9 @@ import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/a
 import { Injectable } from '@angular/core';
 import { throwError } from 'rxjs';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TaskUploadService extends UploadService {
 
     constructor(apiService: AlfrescoApiService, appConfigService: AppConfigService) {
diff --git a/lib/process-services/task-list/services/tasklist.service.ts b/lib/process-services/task-list/services/tasklist.service.ts
index cc61a977a6..2a3adee6d7 100644
--- a/lib/process-services/task-list/services/tasklist.service.ts
+++ b/lib/process-services/task-list/services/tasklist.service.ts
@@ -24,7 +24,9 @@ import { Form } from '../models/form.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListModel } from '../models/task-list.model';
 
-@Injectable()
+@Injectable({
+    providedIn: 'root'
+})
 export class TaskListService {
 
     constructor(private apiService: AlfrescoApiService,