diff --git a/npm/ng-packs/packages/account/src/lib/components/index.ts b/npm/ng-packs/packages/account/src/lib/components/index.ts
index a852329e4e..2e2fb8c6bd 100644
--- a/npm/ng-packs/packages/account/src/lib/components/index.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/index.ts
@@ -3,3 +3,4 @@ export * from './login/login.component';
 export * from './manage-profile/manage-profile.component';
 export * from './register/register.component';
 export * from './personal-settings/personal-settings.component';
+export * from './tenant-box/tenant-box.component';
diff --git a/npm/ng-packs/packages/account/src/lib/services/index.ts b/npm/ng-packs/packages/account/src/lib/services/index.ts
index e69de29bb2..72778be1f1 100644
--- a/npm/ng-packs/packages/account/src/lib/services/index.ts
+++ b/npm/ng-packs/packages/account/src/lib/services/index.ts
@@ -0,0 +1 @@
+export * from './account.service';
diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts
index 0e845f0768..c81bfdc9d6 100644
--- a/npm/ng-packs/packages/account/src/public-api.ts
+++ b/npm/ng-packs/packages/account/src/public-api.ts
@@ -3,3 +3,4 @@ export * from './lib/components';
 export * from './lib/constants/routes';
 export * from './lib/tokens';
 export * from './lib/models';
+export * from './lib/services';
diff --git a/npm/ng-packs/packages/identity/src/lib/components/index.ts b/npm/ng-packs/packages/identity/src/lib/components/index.ts
new file mode 100644
index 0000000000..29c90f5833
--- /dev/null
+++ b/npm/ng-packs/packages/identity/src/lib/components/index.ts
@@ -0,0 +1,2 @@
+export * from './roles/roles.component';
+export * from './users/users.component';
diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts
index 1366e9c333..b86c993f13 100644
--- a/npm/ng-packs/packages/identity/src/public-api.ts
+++ b/npm/ng-packs/packages/identity/src/public-api.ts
@@ -4,8 +4,8 @@
 
 export * from './lib/identity.module';
 export * from './lib/actions/identity.actions';
-export * from './lib/components/roles/roles.component';
+export * from './lib/components';
 export * from './lib/constants/routes';
 export * from './lib/models/identity';
-export * from './lib/services/identity.service';
+export * from './lib/services';
 export * from './lib/states/identity.state';