diff --git a/apps/36-blocks-widget/src/app/otp/user-management/add-user-dialog.component.ts b/apps/36-blocks-widget/src/app/otp/user-management/add-user-dialog.component.ts
index d872b2da..6bb6f4b1 100644
--- a/apps/36-blocks-widget/src/app/otp/user-management/add-user-dialog.component.ts
+++ b/apps/36-blocks-widget/src/app/otp/user-management/add-user-dialog.component.ts
@@ -187,7 +187,7 @@ export class AddUserDialogComponent implements OnInit, OnDestroy {
         });
 
         // Fetch roles for the dropdown
-        this.store.dispatch(otpActions.getRoles({ authToken: this.authToken, itemsPerPage: 1000 }));
+        this.store.dispatch(otpActions.getRoles({ authToken: this.authToken, itemsPerPage: 100 }));
 
         this.store
             .pipe(select(rolesData), distinctUntilChanged(isEqual), takeUntil(this._destroy$))
diff --git a/apps/36-blocks-widget/src/app/otp/user-management/user-management.component.ts b/apps/36-blocks-widget/src/app/otp/user-management/user-management.component.ts
index 08eed4ee..1e5eb44c 100644
--- a/apps/36-blocks-widget/src/app/otp/user-management/user-management.component.ts
+++ b/apps/36-blocks-widget/src/app/otp/user-management/user-management.component.ts
@@ -777,14 +777,14 @@ export class UserManagementComponent implements OnInit, AfterViewInit, OnDestroy
         );
     }
     public getRoles(): void {
-        this.store.dispatch(otpActions.getRoles({ authToken: this.userToken(), itemsPerPage: 1000 }));
+        this.store.dispatch(otpActions.getRoles({ authToken: this.userToken(), itemsPerPage: 100 }));
     }
 
     public onRolesPageChange(event: PageEvent): void {
         this.store.dispatch(otpActions.getRoles({ authToken: this.userToken(), itemsPerPage: event.pageSize }));
     }
     public getPermissions(): void {
-        const pageSize = 1000;
+        const pageSize = 100;
         this.store.dispatch(otpActions.getPermissions({ authToken: this.userToken(), itemsPerPage: pageSize }));
     }
 
diff --git a/apps/36-blocks/src/app/panel/layout/layout.component.ts b/apps/36-blocks/src/app/panel/layout/layout.component.ts
index 5c5f5803..47a5eda8 100644
--- a/apps/36-blocks/src/app/panel/layout/layout.component.ts
+++ b/apps/36-blocks/src/app/panel/layout/layout.component.ts
@@ -75,7 +75,7 @@ export class LayoutComponent extends BaseComponent implements OnInit, OnDestroy
     public toggleMenuSideBar: boolean;
     public showContainer = false;
     public clientsParams = {
-        itemsPerPage: 200,
+        itemsPerPage: 100,
         pageNo: 1,
     };
 
diff --git a/apps/36-blocks/src/app/panel/users/management/management.component.ts b/apps/36-blocks/src/app/panel/users/management/management.component.ts
index 0d351cb4..3e520eec 100644
--- a/apps/36-blocks/src/app/panel/users/management/management.component.ts
+++ b/apps/36-blocks/src/app/panel/users/management/management.component.ts
@@ -102,7 +102,7 @@ export class ManagementComponent implements OnInit, OnDestroy, OnChanges {
         id: new FormControl<number>(null),
     });
     public params: any = {
-        itemsPerPage: 1000,
+        itemsPerPage: 100,
         pageNo: 1,
     };
     /** Current block `reference_id` when embedded (e.g. feature edit). Not the feature type id. */
@@ -115,7 +115,7 @@ export class ManagementComponent implements OnInit, OnDestroy, OnChanges {
     public permissionsPageIndex: number = 0;
     public rolesTotalCount: number = 0;
     public permissionsTotalCount: number = 0;
-    public pageSizeOptions: number[] = [25, 50, 100, 1000];
+    public pageSizeOptions: number[] = [25, 50, 100];
     public features: IFeature[] = [];
     public featureDetails: any;
     public rolesDisplayedColumns: string[] = ['role', 'permissions', 'actions'];
diff --git a/apps/36-blocks/src/app/panel/users/user/user.component.ts b/apps/36-blocks/src/app/panel/users/user/user.component.ts
index aea306a4..380d862f 100644
--- a/apps/36-blocks/src/app/panel/users/user/user.component.ts
+++ b/apps/36-blocks/src/app/panel/users/user/user.component.ts
@@ -130,7 +130,7 @@ export class UserComponent extends BaseComponent implements OnDestroy, OnInit {
     public features: IFeature[] = [];
     /** Feature params */
     public featureParams: any = {
-        itemsPerPage: 1000,
+        itemsPerPage: 100,
         pageNo: 1,
     };
     // public selectedDateRange = {