diff --git a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
index 9cb1f7d8b..0a488dc5a 100644
--- a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
+++ b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { NodePermissionService } from '@alfresco/aca-shared';
 import { Node } from '@alfresco/js-api';
-import { CommentsModule } from '@alfresco/adf-core';
+import { NodeCommentsModule } from '@alfresco/adf-content-services';
 
 describe('CommentsTabComponent', () => {
   let component: CommentsTabComponent;
@@ -38,7 +38,7 @@ describe('CommentsTabComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, CommentsModule],
+      imports: [AppTestingModule, NodeCommentsModule],
       declarations: [CommentsTabComponent]
     });
 
diff --git a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
index bf74bccdf..0b08455b0 100644
--- a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
+++ b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
@@ -29,7 +29,7 @@ import { NodePermissionService, isLocked } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-comments-tab',
-  template: `<mat-card><adf-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-comments></mat-card>`
+  template: `<mat-card><adf-node-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-node-comments></mat-card>`
 })
 export class CommentsTabComponent {
   @Input()
diff --git a/package-lock.json b/package-lock.json
index d200042be..92e71dde3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,9 +11,9 @@
       "dev": true
     },
     "@alfresco/adf-cli": {
-      "version": "6.0.0-A.1-37469",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.1-37469.tgz",
-      "integrity": "sha512-+lJoIeqKS2pF9XudJTmp9iEgz+59gwvj6iJFdxgNwAJ5vznYvjZwQSm6zOwEzzNHmH0U4rXv+WFQntRyDH4QCw==",
+      "version": "6.0.0-A.1-37480",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.1-37480.tgz",
+      "integrity": "sha512-ncpuBi2stohGrz7vFLb76dGiwh+MTfYu5SVl+y77HZGWTb7q5FkPmJeW6Jg9G2cM4AmjRcM7kyqHn+3I8BSezA==",
       "dev": true,
       "requires": {
         "@alfresco/js-api": "5.2.0",
@@ -42,17 +42,17 @@
       }
     },
     "@alfresco/adf-content-services": {
-      "version": "6.0.0-A.1-37469",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.1-37469.tgz",
-      "integrity": "sha512-gxDirglId8GzUkIQUWFQjulDHbkC7yblieTeoSTQWQy6kayg60ifC/uvW4xT/wsvYaVi9m7Wk33PlyH+Raz2sA==",
+      "version": "6.0.0-A.1-37480",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.1-37480.tgz",
+      "integrity": "sha512-4oQHk20p7n+ckfXncIcJnEFxG1O8NDh1UG5gxqw8LsGEEVN5uuecGjgBFNNRZZ2VJdoAAwnq+WEOMb50SYt3mw==",
       "requires": {
         "tslib": "^2.3.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "6.0.0-A.1-37469",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.1-37469.tgz",
-      "integrity": "sha512-zGtIbuTQtuLZiUCzgZE7M9ifXylzwFz5SLNTb1DgVxVy1awhwrjfuV2v2Qq0GH4GT5uhIDaAl4qYZgZDyvSyDw==",
+      "version": "6.0.0-A.1-37480",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.1-37480.tgz",
+      "integrity": "sha512-0dwps42ezbk+/chEgBJBhtcW5+MKV2NxoQlF4ep7MSwoxVIlO5rprrKA+kCXxJ2g+xWx2TsrMMzbdm/KoB0AjA==",
       "requires": {
         "@editorjs/code": "2.7.0",
         "@editorjs/editorjs": "2.25.0",
@@ -70,17 +70,17 @@
       }
     },
     "@alfresco/adf-extensions": {
-      "version": "6.0.0-A.1-37469",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.1-37469.tgz",
-      "integrity": "sha512-SKllVELFsErulN2j9tkvnumKWaS0JD87eNez+2nesJ3F96IJlQTvOSDWETYanauqzZE23iE6Y5jvvg4fbztuQQ==",
+      "version": "6.0.0-A.1-37480",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.1-37480.tgz",
+      "integrity": "sha512-lcgoVZsiDM3kK7QcWBCYQpWdaYMTsXgTyb5dPC3MBfzimFYHTM5/OD3lxqNPmsCjnxHtTiZnQKRpWFIsSky6wA==",
       "requires": {
         "tslib": "^2.3.0"
       }
     },
     "@alfresco/adf-testing": {
-      "version": "6.0.0-A.1-37469",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.1-37469.tgz",
-      "integrity": "sha512-HF732RNnNgTy7kJpEH4sH5/Vz2ZVUuRagEdXNux9GsR7Z6FuazyMa6X9IbbEoGBTTtDN4V8zdEeJDVZeGFTtXA==",
+      "version": "6.0.0-A.1-37480",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.1-37480.tgz",
+      "integrity": "sha512-4gTC0u6ccgyuDyZNqwxZTa+uEZ3NznzPtlLHjg/hjRD1c3bAYb69rTs/e+uUEC9NSX4+VsTxKNawC5Ew6PDfdw==",
       "dev": true,
       "requires": {
         "@alfresco/js-api": "5.3.0-477",
diff --git a/package.json b/package.json
index 6a295e4ad..2c7f7a4ec 100644
--- a/package.json
+++ b/package.json
@@ -26,9 +26,9 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "6.0.0-A.1-37469",
-    "@alfresco/adf-core": "6.0.0-A.1-37469",
-    "@alfresco/adf-extensions": "6.0.0-A.1-37469",
+    "@alfresco/adf-content-services": "6.0.0-A.1-37480",
+    "@alfresco/adf-core": "6.0.0-A.1-37480",
+    "@alfresco/adf-extensions": "6.0.0-A.1-37480",
     "@alfresco/js-api": "5.3.0-477",
     "@angular/animations": "14.1.2",
     "@angular/cdk": "14.1.2",
@@ -58,8 +58,8 @@
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "6.0.0-A.1-37469",
-    "@alfresco/adf-testing": "6.0.0-A.1-37469",
+    "@alfresco/adf-cli": "6.0.0-A.1-37480",
+    "@alfresco/adf-testing": "6.0.0-A.1-37480",
     "@angular-custom-builders/lite-serve": "^0.2.3",
     "@angular-devkit/build-angular": "14.1.2",
     "@angular-eslint/builder": "^14.1.2",