diff --git a/packages/client-ui/config/layout/contants.ts b/packages/client-ui/config/layout/contants.ts
index ea5938280..c8c155962 100644
--- a/packages/client-ui/config/layout/contants.ts
+++ b/packages/client-ui/config/layout/contants.ts
@@ -6,7 +6,8 @@
  */
 
 import type { NavigationItem } from '@vuecs/navigation';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
+import { PermissionName as AuthupPermissionName } from '@authup/core-kit';
 
 export enum LayoutKey {
     NAVIGATION_ID = 'navigationId',
@@ -55,19 +56,19 @@ export const LayoutSideDefaultNavigation: NavigationItem[] = [
         icon: 'fas fa-tasks',
         [LayoutKey.REQUIRED_LOGGED_IN]: true,
         [LayoutKey.REQUIRED_PERMISSIONS]: [
-            PermissionID.PROJECT_ADD,
-            PermissionID.PROJECT_DROP,
-            PermissionID.PROJECT_EDIT,
-            PermissionID.PROJECT_APPROVE,
+            PermissionName.PROJECT_CREATE,
+            PermissionName.PROJECT_DELETE,
+            PermissionName.PROJECT_UPDATE,
+            PermissionName.PROJECT_APPROVE,
 
-            PermissionID.ANALYSIS_ADD,
-            PermissionID.ANALYSIS_DROP,
-            PermissionID.ANALYSIS_EDIT,
-            PermissionID.ANALYSIS_APPROVE,
+            PermissionName.ANALYSIS_CREATE,
+            PermissionName.ANALYSIS_DELETE,
+            PermissionName.ANALYSIS_UPDATE,
+            PermissionName.ANALYSIS_APPROVE,
 
-            PermissionID.ANALYSIS_RESULT_READ,
-            PermissionID.ANALYSIS_EXECUTION_START,
-            PermissionID.ANALYSIS_EXECUTION_STOP,
+            PermissionName.ANALYSIS_RESULT_READ,
+            PermissionName.ANALYSIS_EXECUTION_START,
+            PermissionName.ANALYSIS_EXECUTION_STOP,
         ],
     },
     {
@@ -77,13 +78,13 @@ export const LayoutSideDefaultNavigation: NavigationItem[] = [
         icon: 'fa fa-bar-chart',
         requireLoggedIn: true,
         requirePermissions: [
-            PermissionID.ANALYSIS_ADD,
-            PermissionID.ANALYSIS_DROP,
-            PermissionID.ANALYSIS_EDIT,
-            PermissionID.ANALYSIS_APPROVE,
+            PermissionName.ANALYSIS_CREATE,
+            PermissionName.ANALYSIS_DELETE,
+            PermissionName.ANALYSIS_UPDATE,
+            PermissionName.ANALYSIS_APPROVE,
 
-            PermissionID.ANALYSIS_EXECUTION_START,
-            PermissionID.ANALYSIS_EXECUTION_STOP,
+            PermissionName.ANALYSIS_EXECUTION_START,
+            PermissionName.ANALYSIS_EXECUTION_STOP,
         ],
     },
     {
@@ -112,27 +113,27 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
         icon: 'fas fa-lock',
         [LayoutKey.REQUIRED_LOGGED_IN]: true,
         [LayoutKey.REQUIRED_PERMISSIONS]: [
-            PermissionID.REALM_ADD,
-            PermissionID.REALM_EDIT,
-            PermissionID.REALM_DROP,
+            AuthupPermissionName.REALM_CREATE,
+            AuthupPermissionName.REALM_UPDATE,
+            AuthupPermissionName.REALM_DELETE,
 
-            PermissionID.PROVIDER_ADD,
-            PermissionID.PROVIDER_EDIT,
-            PermissionID.PROVIDER_DROP,
+            AuthupPermissionName.IDENTITY_PROVIDER_CREATE,
+            AuthupPermissionName.IDENTITY_PROVIDER_UPDATE,
+            AuthupPermissionName.IDENTITY_PROVIDER_DELETE,
 
-            PermissionID.USER_ADD,
-            PermissionID.USER_EDIT,
-            PermissionID.USER_DROP,
+            AuthupPermissionName.USER_CREATE,
+            AuthupPermissionName.USER_UPDATE,
+            AuthupPermissionName.USER_DELETE,
 
-            PermissionID.ROLE_ADD,
-            PermissionID.ROLE_EDIT,
-            PermissionID.ROLE_DROP,
-            PermissionID.ROLE_PERMISSION_ADD,
-            PermissionID.ROLE_PERMISSION_DROP,
+            AuthupPermissionName.ROLE_CREATE,
+            AuthupPermissionName.ROLE_UPDATE,
+            AuthupPermissionName.ROLE_DELETE,
+            AuthupPermissionName.ROLE_PERMISSION_CREATE,
+            AuthupPermissionName.ROLE_PERMISSION_DELETE,
 
-            PermissionID.PERMISSION_ADD,
-            PermissionID.PERMISSION_EDIT,
-            PermissionID.PERMISSION_DROP,
+            AuthupPermissionName.PERMISSION_CREATE,
+            AuthupPermissionName.PERMISSION_UPDATE,
+            AuthupPermissionName.PERMISSION_DELETE,
         ],
         children: [
             {
@@ -142,13 +143,13 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-university',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.REALM_ADD,
-                    PermissionID.REALM_EDIT,
-                    PermissionID.REALM_DROP,
+                    AuthupPermissionName.REALM_CREATE,
+                    AuthupPermissionName.REALM_UPDATE,
+                    AuthupPermissionName.REALM_DELETE,
 
-                    PermissionID.PROVIDER_ADD,
-                    PermissionID.PROVIDER_DROP,
-                    PermissionID.PROJECT_EDIT,
+                    AuthupPermissionName.IDENTITY_PROVIDER_CREATE,
+                    AuthupPermissionName.IDENTITY_PROVIDER_DELETE,
+                    PermissionName.PROJECT_UPDATE,
                 ],
             },
             {
@@ -158,9 +159,9 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-atom',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.PROVIDER_ADD,
-                    PermissionID.PROVIDER_EDIT,
-                    PermissionID.PROVIDER_DROP,
+                    AuthupPermissionName.IDENTITY_PROVIDER_CREATE,
+                    AuthupPermissionName.IDENTITY_PROVIDER_UPDATE,
+                    AuthupPermissionName.IDENTITY_PROVIDER_DELETE,
                 ],
             },
             {
@@ -170,9 +171,9 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-robot',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.ROBOT_ADD,
-                    PermissionID.ROBOT_EDIT,
-                    PermissionID.ROBOT_DROP,
+                    AuthupPermissionName.ROBOT_CREATE,
+                    AuthupPermissionName.ROBOT_UPDATE,
+                    AuthupPermissionName.ROBOT_DELETE,
                 ],
             },
             {
@@ -182,9 +183,9 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-user',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.USER_ADD,
-                    PermissionID.USER_EDIT,
-                    PermissionID.USER_DROP,
+                    AuthupPermissionName.USER_CREATE,
+                    AuthupPermissionName.USER_UPDATE,
+                    AuthupPermissionName.USER_DELETE,
                 ],
             },
             {
@@ -194,12 +195,12 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-users',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.ROLE_ADD,
-                    PermissionID.ROLE_EDIT,
-                    PermissionID.ROLE_DROP,
+                    AuthupPermissionName.ROLE_CREATE,
+                    AuthupPermissionName.ROLE_UPDATE,
+                    AuthupPermissionName.ROLE_DELETE,
 
-                    PermissionID.ROLE_PERMISSION_ADD,
-                    PermissionID.ROLE_PERMISSION_DROP,
+                    AuthupPermissionName.ROLE_PERMISSION_CREATE,
+                    AuthupPermissionName.ROLE_PERMISSION_DELETE,
                 ],
             },
             {
@@ -209,9 +210,9 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fas fa-key',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.PERMISSION_ADD,
-                    PermissionID.PERMISSION_EDIT,
-                    PermissionID.PERMISSION_DROP,
+                    AuthupPermissionName.PERMISSION_CREATE,
+                    AuthupPermissionName.PERMISSION_UPDATE,
+                    AuthupPermissionName.PERMISSION_DELETE,
                 ],
             },
         ],
@@ -222,11 +223,11 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
         icon: 'fas fa-globe',
         [LayoutKey.REQUIRED_LOGGED_IN]: true,
         [LayoutKey.REQUIRED_PERMISSIONS]: [
-            PermissionID.NODE_ADD,
-            PermissionID.NODE_DROP,
-            PermissionID.NODE_EDIT,
+            PermissionName.NODE_CREATE,
+            PermissionName.NODE_DELETE,
+            PermissionName.NODE_UPDATE,
 
-            PermissionID.SERVICE_MANAGE,
+            PermissionName.SERVICE_MANAGE,
         ],
         children: [
             {
@@ -236,9 +237,9 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fa-solid fa-server',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.NODE_ADD,
-                    PermissionID.NODE_DROP,
-                    PermissionID.NODE_EDIT,
+                    PermissionName.NODE_CREATE,
+                    PermissionName.NODE_DELETE,
+                    PermissionName.NODE_UPDATE,
                 ],
             },
             {
@@ -248,7 +249,7 @@ export const LayoutSideAdminNavigation: NavigationItem[] = [
                 icon: 'fa fa-map-signs',
                 [LayoutKey.REQUIRED_LOGGED_IN]: true,
                 [LayoutKey.REQUIRED_PERMISSIONS]: [
-                    PermissionID.SERVICE_MANAGE,
+                    PermissionName.SERVICE_MANAGE,
                 ],
             },
         ],
diff --git a/packages/client-ui/pages/admin/identity-providers/[id].vue b/packages/client-ui/pages/admin/identity-providers/[id].vue
index 47d4be5f9..51d9144d1 100644
--- a/packages/client-ui/pages/admin/identity-providers/[id].vue
+++ b/packages/client-ui/pages/admin/identity-providers/[id].vue
@@ -29,7 +29,8 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_EDIT,
+                PermissionName.IDENTITY_PROVIDER_UPDATE,
+                PermissionName.IDENTITY_PROVIDER_READ,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/identity-providers/[id]/index.vue b/packages/client-ui/pages/admin/identity-providers/[id]/index.vue
index 0266e36fd..50776c8ad 100644
--- a/packages/client-ui/pages/admin/identity-providers/[id]/index.vue
+++ b/packages/client-ui/pages/admin/identity-providers/[id]/index.vue
@@ -29,7 +29,7 @@ export default defineNuxtComponent({
         definePageMeta({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_EDIT,
+                PermissionName.IDENTITY_PROVIDER_UPDATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/identity-providers/index.vue b/packages/client-ui/pages/admin/identity-providers/index.vue
index 2664fd3fe..586d41918 100644
--- a/packages/client-ui/pages/admin/identity-providers/index.vue
+++ b/packages/client-ui/pages/admin/identity-providers/index.vue
@@ -19,9 +19,10 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.PROVIDER_EDIT,
-                PermissionName.PROVIDER_DROP,
-                PermissionName.PROVIDER_ADD,
+                PermissionName.IDENTITY_PROVIDER_UPDATE,
+                PermissionName.IDENTITY_PROVIDER_DELETE,
+                PermissionName.IDENTITY_PROVIDER_CREATE,
+                PermissionName.IDENTITY_PROVIDER_READ,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/identity-providers/index/add.vue b/packages/client-ui/pages/admin/identity-providers/index/add.vue
index bd204542f..3aea3d15e 100644
--- a/packages/client-ui/pages/admin/identity-providers/index/add.vue
+++ b/packages/client-ui/pages/admin/identity-providers/index/add.vue
@@ -27,7 +27,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_ADD,
+                PermissionName.IDENTITY_PROVIDER_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/identity-providers/index/index.vue b/packages/client-ui/pages/admin/identity-providers/index/index.vue
index 911799f6c..f2214ce31 100644
--- a/packages/client-ui/pages/admin/identity-providers/index/index.vue
+++ b/packages/client-ui/pages/admin/identity-providers/index/index.vue
@@ -46,8 +46,8 @@ export default defineNuxtComponent({
             resource: IdentityProvider,
         ) => isRealmResourceWritable(realm.value, resource.realm_id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.PROVIDER_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.PROVIDER_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.IDENTITY_PROVIDER_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.IDENTITY_PROVIDER_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/admin/nodes/[id].vue b/packages/client-ui/pages/admin/nodes/[id].vue
index c58bdc9fc..43829ffbd 100644
--- a/packages/client-ui/pages/admin/nodes/[id].vue
+++ b/packages/client-ui/pages/admin/nodes/[id].vue
@@ -46,7 +46,6 @@ export default defineNuxtComponent({
                 fields: [
                     '+registry_id',
                     '+registry_project_id',
-                    '+email',
                     '+external_name',
                 ],
             },
diff --git a/packages/client-ui/pages/admin/nodes/index.vue b/packages/client-ui/pages/admin/nodes/index.vue
index 45070fa08..4bca4acb7 100644
--- a/packages/client-ui/pages/admin/nodes/index.vue
+++ b/packages/client-ui/pages/admin/nodes/index.vue
@@ -7,7 +7,7 @@
 
 <script lang="ts">
 import type { Node } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { definePageMeta, useToast } from '#imports';
 import { defineNuxtComponent, navigateTo } from '#app';
 import { LayoutKey, LayoutNavigationID } from '../../../config/layout';
@@ -18,9 +18,9 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.NODE_EDIT,
-                PermissionID.NODE_DROP,
-                PermissionID.NODE_ADD,
+                PermissionName.NODE_UPDATE,
+                PermissionName.NODE_DELETE,
+                PermissionName.NODE_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/nodes/index/add.vue b/packages/client-ui/pages/admin/nodes/index/add.vue
index 89b80a36a..413e2ab6b 100644
--- a/packages/client-ui/pages/admin/nodes/index/add.vue
+++ b/packages/client-ui/pages/admin/nodes/index/add.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { useStore } from '@authup/client-web-kit';
 import type { Node } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { storeToRefs } from 'pinia';
 import { FNodeForm } from '@privateaim/client-vue';
 import { defineNuxtComponent } from '#app';
@@ -22,7 +22,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.NODE_ADD,
+                PermissionName.NODE_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/nodes/index/index.vue b/packages/client-ui/pages/admin/nodes/index/index.vue
index 0e48d587d..d8a59fb74 100644
--- a/packages/client-ui/pages/admin/nodes/index/index.vue
+++ b/packages/client-ui/pages/admin/nodes/index/index.vue
@@ -6,9 +6,9 @@
   -->
 <script lang="ts">
 import { useAbilityCheck, useStore } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type { Node } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
 import { BTable } from 'bootstrap-vue-next';
 import { storeToRefs } from 'pinia';
 import type { BuildInput } from 'rapiq';
@@ -58,8 +58,8 @@ export default defineNuxtComponent({
         const store = useStore();
         const { realmManagementId } = storeToRefs(store);
 
-        const canEdit = useAbilityCheck(PermissionID.NODE_EDIT);
-        const canDrop = useAbilityCheck(PermissionID.NODE_DROP);
+        const canEdit = useAbilityCheck(PermissionName.NODE_UPDATE);
+        const canDrop = useAbilityCheck(PermissionName.NODE_DELETE);
         const canView = computed(() => canEdit.value || canDrop.value);
 
         const query = computed<BuildInput<Node>>(() => ({
diff --git a/packages/client-ui/pages/admin/permissions/[id].vue b/packages/client-ui/pages/admin/permissions/[id].vue
index 04c78395c..45c218343 100644
--- a/packages/client-ui/pages/admin/permissions/[id].vue
+++ b/packages/client-ui/pages/admin/permissions/[id].vue
@@ -28,7 +28,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.PERMISSION_EDIT,
+                PermissionName.PERMISSION_UPDATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/permissions/index.vue b/packages/client-ui/pages/admin/permissions/index.vue
index 6ea69e005..59f2fb54c 100644
--- a/packages/client-ui/pages/admin/permissions/index.vue
+++ b/packages/client-ui/pages/admin/permissions/index.vue
@@ -19,9 +19,9 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.PERMISSION_EDIT,
-                PermissionName.PERMISSION_DROP,
-                PermissionName.PERMISSION_ADD,
+                PermissionName.PERMISSION_UPDATE,
+                PermissionName.PERMISSION_DELETE,
+                PermissionName.PERMISSION_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/permissions/index/add.vue b/packages/client-ui/pages/admin/permissions/index/add.vue
index c59f71c4b..9370d70f3 100644
--- a/packages/client-ui/pages/admin/permissions/index/add.vue
+++ b/packages/client-ui/pages/admin/permissions/index/add.vue
@@ -23,7 +23,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.PERMISSION_ADD,
+                PermissionName.PERMISSION_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/permissions/index/index.vue b/packages/client-ui/pages/admin/permissions/index/index.vue
index cf372fa1f..a2b3e4c80 100644
--- a/packages/client-ui/pages/admin/permissions/index/index.vue
+++ b/packages/client-ui/pages/admin/permissions/index/index.vue
@@ -47,8 +47,8 @@ export default defineNuxtComponent({
             resource: Permission,
         ) => isRealmResourceWritable(realm.value, resource.realm_id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.PERMISSION_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.PERMISSION_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.PERMISSION_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.PERMISSION_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/admin/realms/[id].vue b/packages/client-ui/pages/admin/realms/[id].vue
index 6aab935de..0e7178f10 100644
--- a/packages/client-ui/pages/admin/realms/[id].vue
+++ b/packages/client-ui/pages/admin/realms/[id].vue
@@ -28,7 +28,8 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_EDIT,
+                PermissionName.REALM_UPDATE,
+                PermissionName.REALM_READ,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/realms/[id]/index.vue b/packages/client-ui/pages/admin/realms/[id]/index.vue
index b5de132bb..bd0690f56 100644
--- a/packages/client-ui/pages/admin/realms/[id]/index.vue
+++ b/packages/client-ui/pages/admin/realms/[id]/index.vue
@@ -28,7 +28,7 @@ export default defineNuxtComponent({
         definePageMeta({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_EDIT,
+                PermissionName.REALM_UPDATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/realms/index.vue b/packages/client-ui/pages/admin/realms/index.vue
index 7f8320320..b13bf0156 100644
--- a/packages/client-ui/pages/admin/realms/index.vue
+++ b/packages/client-ui/pages/admin/realms/index.vue
@@ -18,9 +18,10 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_EDIT,
-                PermissionName.REALM_DROP,
-                PermissionName.REALM_ADD,
+                PermissionName.REALM_UPDATE,
+                PermissionName.REALM_READ,
+                PermissionName.REALM_DELETE,
+                PermissionName.REALM_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/realms/index/add.vue b/packages/client-ui/pages/admin/realms/index/add.vue
index d7d9e4097..d0e2bfe09 100644
--- a/packages/client-ui/pages/admin/realms/index/add.vue
+++ b/packages/client-ui/pages/admin/realms/index/add.vue
@@ -24,7 +24,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.REALM_ADD,
+                PermissionName.REALM_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/realms/index/index.vue b/packages/client-ui/pages/admin/realms/index/index.vue
index dfd7fbdd2..eeda24461 100644
--- a/packages/client-ui/pages/admin/realms/index/index.vue
+++ b/packages/client-ui/pages/admin/realms/index/index.vue
@@ -42,8 +42,8 @@ export default defineNuxtComponent({
             entity: Realm,
         ) => isRealmResourceWritable(realm.value, entity.id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.REALM_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.REALM_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.REALM_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.REALM_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/admin/robots/[id].vue b/packages/client-ui/pages/admin/robots/[id].vue
index 5f4cf71bd..cb18dba70 100644
--- a/packages/client-ui/pages/admin/robots/[id].vue
+++ b/packages/client-ui/pages/admin/robots/[id].vue
@@ -28,10 +28,10 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROBOT_EDIT,
-                PermissionName.ROBOT_ROLE_ADD,
-                PermissionName.ROBOT_ROLE_EDIT,
-                PermissionName.ROBOT_ROLE_DROP,
+                PermissionName.ROBOT_UPDATE,
+                PermissionName.ROBOT_ROLE_CREATE,
+                PermissionName.ROBOT_ROLE_UPDATE,
+                PermissionName.ROBOT_ROLE_DELETE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/robots/index.vue b/packages/client-ui/pages/admin/robots/index.vue
index 0117b9496..756e6dba8 100644
--- a/packages/client-ui/pages/admin/robots/index.vue
+++ b/packages/client-ui/pages/admin/robots/index.vue
@@ -18,9 +18,9 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROBOT_EDIT,
-                PermissionName.ROBOT_DROP,
-                PermissionName.ROBOT_ADD,
+                PermissionName.ROBOT_UPDATE,
+                PermissionName.ROBOT_DELETE,
+                PermissionName.ROBOT_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/robots/index/add.vue b/packages/client-ui/pages/admin/robots/index/add.vue
index 747ababef..f23027181 100644
--- a/packages/client-ui/pages/admin/robots/index/add.vue
+++ b/packages/client-ui/pages/admin/robots/index/add.vue
@@ -23,7 +23,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROBOT_ADD,
+                PermissionName.ROBOT_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/robots/index/index.vue b/packages/client-ui/pages/admin/robots/index/index.vue
index 5baece905..bac65b514 100644
--- a/packages/client-ui/pages/admin/robots/index/index.vue
+++ b/packages/client-ui/pages/admin/robots/index/index.vue
@@ -44,8 +44,8 @@ export default defineNuxtComponent({
             resource: Robot,
         ) => isRealmResourceWritable(realm.value, resource.realm_id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.ROBOT_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.ROBOT_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.ROBOT_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.ROBOT_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/admin/roles/[id].vue b/packages/client-ui/pages/admin/roles/[id].vue
index 1303af145..58c447d50 100644
--- a/packages/client-ui/pages/admin/roles/[id].vue
+++ b/packages/client-ui/pages/admin/roles/[id].vue
@@ -29,10 +29,10 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROLE_EDIT,
-                PermissionName.USER_ROLE_ADD,
-                PermissionName.USER_ROLE_EDIT,
-                PermissionName.USER_ROLE_DROP,
+                PermissionName.ROLE_UPDATE,
+                PermissionName.USER_ROLE_CREATE,
+                PermissionName.USER_ROLE_UPDATE,
+                PermissionName.USER_ROLE_DELETE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/roles/index.vue b/packages/client-ui/pages/admin/roles/index.vue
index 64bfd1bbb..46f7ae17e 100644
--- a/packages/client-ui/pages/admin/roles/index.vue
+++ b/packages/client-ui/pages/admin/roles/index.vue
@@ -22,9 +22,9 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROLE_EDIT,
-                PermissionName.ROLE_DROP,
-                PermissionName.ROLE_ADD,
+                PermissionName.ROLE_UPDATE,
+                PermissionName.ROLE_DELETE,
+                PermissionName.ROLE_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/roles/index/add.vue b/packages/client-ui/pages/admin/roles/index/add.vue
index c1d601c55..896eeaa75 100644
--- a/packages/client-ui/pages/admin/roles/index/add.vue
+++ b/packages/client-ui/pages/admin/roles/index/add.vue
@@ -24,7 +24,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.ROLE_ADD,
+                PermissionName.ROLE_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/roles/index/index.vue b/packages/client-ui/pages/admin/roles/index/index.vue
index c5bc868e0..8ebddbea7 100644
--- a/packages/client-ui/pages/admin/roles/index/index.vue
+++ b/packages/client-ui/pages/admin/roles/index/index.vue
@@ -44,8 +44,8 @@ export default defineNuxtComponent({
             resource: Role,
         ) => isRealmResourceWritable(realm.value, resource.realm_id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.ROLE_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.ROLE_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.ROLE_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.ROLE_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/admin/services/index.vue b/packages/client-ui/pages/admin/services/index.vue
index db5148fd5..c3dab5810 100644
--- a/packages/client-ui/pages/admin/services/index.vue
+++ b/packages/client-ui/pages/admin/services/index.vue
@@ -5,7 +5,8 @@
   - view the LICENSE file that was distributed with this source code.
   -->
 <script lang="ts">
-import { PermissionID, ServiceID } from '@privateaim/core-kit';
+import { ServiceID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { definePageMeta, navigateTo } from '#imports';
 import { defineNuxtComponent } from '#app';
 import { LayoutKey, LayoutNavigationID } from '~/config/layout';
@@ -15,7 +16,7 @@ export default defineNuxtComponent({
         definePageMeta({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.SERVICE_MANAGE,
+                PermissionName.SERVICE_MANAGE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/services/registry/[id].vue b/packages/client-ui/pages/admin/services/registry/[id].vue
index fd3e0739f..1196e9dda 100644
--- a/packages/client-ui/pages/admin/services/registry/[id].vue
+++ b/packages/client-ui/pages/admin/services/registry/[id].vue
@@ -5,8 +5,9 @@
   - view the LICENSE file that was distributed with this source code.
   -->
 <script lang="ts">
-import { DomainType, PermissionID } from '@privateaim/core-kit';
+import { DomainType } from '@privateaim/core-kit';
 import { createEntityManager } from '@privateaim/client-vue';
+import { PermissionName } from '@privateaim/kit';
 import { computed } from 'vue';
 import {
     createError,
@@ -22,7 +23,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.REGISTRY_MANAGE,
+                PermissionName.REGISTRY_MANAGE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/services/registry/[id]/projects.vue b/packages/client-ui/pages/admin/services/registry/[id]/projects.vue
index 4341c58af..fde71d332 100644
--- a/packages/client-ui/pages/admin/services/registry/[id]/projects.vue
+++ b/packages/client-ui/pages/admin/services/registry/[id]/projects.vue
@@ -6,7 +6,7 @@
   -->
 
 <script lang="ts">
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import type { Realm } from '@authup/core-kit';
 import { definePageMeta } from '#imports';
@@ -25,7 +25,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.REGISTRY_MANAGE,
+                PermissionName.REGISTRY_MANAGE,
             ],
         });
     },
diff --git a/packages/client-ui/pages/admin/services/registry/[id]/projects/add.vue b/packages/client-ui/pages/admin/services/registry/[id]/projects/add.vue
index 0b4442f7e..cb19a85f5 100644
--- a/packages/client-ui/pages/admin/services/registry/[id]/projects/add.vue
+++ b/packages/client-ui/pages/admin/services/registry/[id]/projects/add.vue
@@ -6,7 +6,7 @@
   -->
 <script lang="ts">
 import type { Registry } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import { RegistryProjectForm } from '@privateaim/client-vue';
 import { definePageMeta, useToast } from '#imports';
@@ -26,7 +26,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.REGISTRY_MANAGE,
+                PermissionName.REGISTRY_MANAGE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/services/registry/[id]/projects/index.vue b/packages/client-ui/pages/admin/services/registry/[id]/projects/index.vue
index 7f122714f..86120d64b 100644
--- a/packages/client-ui/pages/admin/services/registry/[id]/projects/index.vue
+++ b/packages/client-ui/pages/admin/services/registry/[id]/projects/index.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { useAbilityCheck } from '@authup/client-web-kit';
 import type { Registry, RegistryProject } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { BModal, BTable } from 'bootstrap-vue-next';
 import type { BuildInput } from 'rapiq';
 import { computed, ref, toRefs } from 'vue';
@@ -76,8 +76,8 @@ export default {
             },
         ];
 
-        const canEdit = useAbilityCheck(PermissionID.NODE_EDIT);
-        const canDrop = useAbilityCheck(PermissionID.NODE_DROP);
+        const canEdit = useAbilityCheck(PermissionName.NODE_UPDATE);
+        const canDrop = useAbilityCheck(PermissionName.NODE_DELETE);
         const canView = computed(() => canEdit.value || canDrop.value);
 
         const listNode = ref<null | typeof RegistryProjectList>(null);
diff --git a/packages/client-ui/pages/admin/services/registry/index.vue b/packages/client-ui/pages/admin/services/registry/index.vue
index 57ad64cb6..6ad3520fe 100644
--- a/packages/client-ui/pages/admin/services/registry/index.vue
+++ b/packages/client-ui/pages/admin/services/registry/index.vue
@@ -7,7 +7,7 @@
 
 <script lang="ts">
 import type { Registry } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { definePageMeta, useToast } from '#imports';
 import { defineNuxtComponent } from '#app';
 import { LayoutKey, LayoutNavigationID } from '../../../../config/layout';
@@ -18,7 +18,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.REGISTRY_MANAGE,
+                PermissionName.REGISTRY_MANAGE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/services/registry/index/add.vue b/packages/client-ui/pages/admin/services/registry/index/add.vue
index 4ff150703..c07fd4154 100644
--- a/packages/client-ui/pages/admin/services/registry/index/add.vue
+++ b/packages/client-ui/pages/admin/services/registry/index/add.vue
@@ -5,8 +5,8 @@
   - view the LICENSE file that was distributed with this source code.
   -->
 <script lang="ts">
+import { PermissionName } from '@authup/core-kit';
 import type { Registry } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
 import { RegistryForm } from '@privateaim/client-vue';
 import { definePageMeta, navigateTo } from '#imports';
 import { defineNuxtComponent } from '#app';
@@ -19,7 +19,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.ROBOT_ADD,
+                PermissionName.ROBOT_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/services/registry/index/index.vue b/packages/client-ui/pages/admin/services/registry/index/index.vue
index 8a87d3297..fc6223d59 100644
--- a/packages/client-ui/pages/admin/services/registry/index/index.vue
+++ b/packages/client-ui/pages/admin/services/registry/index/index.vue
@@ -6,9 +6,9 @@
   -->
 <script lang="ts">
 import { useAbilityCheck } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type { Registry } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
 import { BSpinner, BTable } from 'bootstrap-vue-next';
 import type { BuildInput } from 'rapiq';
 import { ref } from 'vue';
@@ -55,7 +55,7 @@ export default defineNuxtComponent({
             },
         };
 
-        const canManage = useAbilityCheck(PermissionID.REGISTRY_MANAGE);
+        const canManage = useAbilityCheck(PermissionName.REGISTRY_MANAGE);
 
         const registryNode = ref<typeof RegistryList | null>(null);
 
diff --git a/packages/client-ui/pages/admin/users/[id].vue b/packages/client-ui/pages/admin/users/[id].vue
index 22651c946..c2b8a2720 100644
--- a/packages/client-ui/pages/admin/users/[id].vue
+++ b/packages/client-ui/pages/admin/users/[id].vue
@@ -28,10 +28,10 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.USER_EDIT,
-                PermissionName.USER_ROLE_ADD,
-                PermissionName.USER_ROLE_EDIT,
-                PermissionName.USER_ROLE_DROP,
+                PermissionName.USER_UPDATE,
+                PermissionName.USER_ROLE_CREATE,
+                PermissionName.USER_ROLE_UPDATE,
+                PermissionName.USER_ROLE_DELETE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/users/[id]/permissions.vue b/packages/client-ui/pages/admin/users/[id]/permissions.vue
index 8638b465a..df3a11170 100644
--- a/packages/client-ui/pages/admin/users/[id]/permissions.vue
+++ b/packages/client-ui/pages/admin/users/[id]/permissions.vue
@@ -22,11 +22,6 @@ export default defineNuxtComponent({
             required: true,
         },
     },
-    setup(props) {
-        return {
-            entity: props.entity,
-        };
-    },
 });
 </script>
 <template>
diff --git a/packages/client-ui/pages/admin/users/[id]/roles.vue b/packages/client-ui/pages/admin/users/[id]/roles.vue
index 7ab9a92fd..b9fa3796e 100644
--- a/packages/client-ui/pages/admin/users/[id]/roles.vue
+++ b/packages/client-ui/pages/admin/users/[id]/roles.vue
@@ -23,11 +23,6 @@ export default defineNuxtComponent({
             required: true,
         },
     },
-    setup(props) {
-        return {
-            entity: props.entity,
-        };
-    },
 });
 </script>
 <template>
diff --git a/packages/client-ui/pages/admin/users/index.vue b/packages/client-ui/pages/admin/users/index.vue
index c63321f68..fca9c4473 100644
--- a/packages/client-ui/pages/admin/users/index.vue
+++ b/packages/client-ui/pages/admin/users/index.vue
@@ -18,9 +18,9 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.USER_EDIT,
-                PermissionName.USER_ADD,
-                PermissionName.USER_DROP,
+                PermissionName.USER_UPDATE,
+                PermissionName.USER_CREATE,
+                PermissionName.USER_DELETE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/users/index/add.vue b/packages/client-ui/pages/admin/users/index/add.vue
index 4c5e71665..62a1e01e2 100644
--- a/packages/client-ui/pages/admin/users/index/add.vue
+++ b/packages/client-ui/pages/admin/users/index/add.vue
@@ -24,7 +24,7 @@ export default defineNuxtComponent({
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.ADMIN,
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionName.USER_ADD,
+                PermissionName.USER_CREATE,
             ],
         });
 
diff --git a/packages/client-ui/pages/admin/users/index/index.vue b/packages/client-ui/pages/admin/users/index/index.vue
index 5fa24d126..40703b4ee 100644
--- a/packages/client-ui/pages/admin/users/index/index.vue
+++ b/packages/client-ui/pages/admin/users/index/index.vue
@@ -42,8 +42,8 @@ export default defineNuxtComponent({
             resource: User,
         ) => isRealmResourceWritable(realm.value, resource.realm_id);
 
-        const hasEditPermission = useAbilityCheck(PermissionName.USER_EDIT);
-        const hasDropPermission = useAbilityCheck(PermissionName.USER_DROP);
+        const hasEditPermission = useAbilityCheck(PermissionName.USER_UPDATE);
+        const hasDropPermission = useAbilityCheck(PermissionName.USER_DELETE);
 
         const fields = [
             {
diff --git a/packages/client-ui/pages/analyses/index/in.vue b/packages/client-ui/pages/analyses/index/in.vue
index 51751a061..5661eef35 100644
--- a/packages/client-ui/pages/analyses/index/in.vue
+++ b/packages/client-ui/pages/analyses/index/in.vue
@@ -6,9 +6,9 @@
   -->
 <script lang="ts">
 import { useAbilityCheck, useStore } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type { AnalysisNode } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
 import { BDropdown, BTable } from 'bootstrap-vue-next';
 import { storeToRefs } from 'pinia';
 import type { BuildInput } from 'rapiq';
@@ -46,7 +46,7 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.ANALYSIS_APPROVE,
+                PermissionName.ANALYSIS_APPROVE,
             ],
         });
 
@@ -76,7 +76,7 @@ export default defineNuxtComponent({
         const store = useStore();
         const { realmId } = storeToRefs(store);
 
-        const canManage = computed(() => useAbilityCheck(PermissionID.ANALYSIS_APPROVE));
+        const canManage = computed(() => useAbilityCheck(PermissionName.ANALYSIS_APPROVE));
 
         const query : BuildInput<AnalysisNode> = {
             include: {
diff --git a/packages/client-ui/pages/analyses/index/index.vue b/packages/client-ui/pages/analyses/index/index.vue
index 2d2f40247..9c6041fbf 100644
--- a/packages/client-ui/pages/analyses/index/index.vue
+++ b/packages/client-ui/pages/analyses/index/index.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { useStore } from '@authup/client-web-kit';
 import type { Analysis } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { storeToRefs } from 'pinia';
 import type { BuildInput } from 'rapiq';
 import { computed } from 'vue';
@@ -27,14 +27,14 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.ANALYSIS_ADD,
-                PermissionID.ANALYSIS_EDIT,
-                PermissionID.ANALYSIS_DROP,
+                PermissionName.ANALYSIS_CREATE,
+                PermissionName.ANALYSIS_UPDATE,
+                PermissionName.ANALYSIS_DELETE,
 
-                PermissionID.ANALYSIS_RESULT_READ,
+                PermissionName.ANALYSIS_RESULT_READ,
 
-                PermissionID.ANALYSIS_EXECUTION_START,
-                PermissionID.ANALYSIS_EXECUTION_STOP,
+                PermissionName.ANALYSIS_EXECUTION_START,
+                PermissionName.ANALYSIS_EXECUTION_STOP,
             ],
         });
 
diff --git a/packages/client-ui/pages/projects/[id].vue b/packages/client-ui/pages/projects/[id].vue
index aadd13298..7658b271b 100644
--- a/packages/client-ui/pages/projects/[id].vue
+++ b/packages/client-ui/pages/projects/[id].vue
@@ -12,9 +12,9 @@ import type {
 } from '@privateaim/core-kit';
 import {
     DomainType,
-    PermissionID,
 } from '@privateaim/core-kit';
 import { createEntityManager, injectCoreHTTPClient } from '@privateaim/client-vue';
+import { PermissionName } from '@privateaim/kit';
 import type { Ref } from 'vue';
 import {
     computed, ref,
@@ -42,7 +42,7 @@ export default defineNuxtComponent({
         const store = useStore();
         const api = injectCoreHTTPClient();
 
-        const canEdit = useAbilityCheck(PermissionID.PROJECT_EDIT);
+        const canEdit = useAbilityCheck(PermissionName.PROJECT_UPDATE);
 
         const manager = createEntityManager<`${DomainType.PROJECT}`>({
             type: `${DomainType.PROJECT}`,
diff --git a/packages/client-ui/pages/projects/[id]/analyses/index.vue b/packages/client-ui/pages/projects/[id]/analyses/index.vue
index 1b123c0d6..4d4e96160 100644
--- a/packages/client-ui/pages/projects/[id]/analyses/index.vue
+++ b/packages/client-ui/pages/projects/[id]/analyses/index.vue
@@ -6,7 +6,7 @@
   -->
 <script lang="ts">
 import type { Analysis, Project, ProjectNode } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { BuildInput } from 'rapiq';
 import { computed } from 'vue';
 import type { PropType } from 'vue';
@@ -32,14 +32,14 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.ANALYSIS_ADD,
-                PermissionID.ANALYSIS_EDIT,
-                PermissionID.ANALYSIS_DROP,
+                PermissionName.ANALYSIS_CREATE,
+                PermissionName.ANALYSIS_UPDATE,
+                PermissionName.ANALYSIS_DELETE,
 
-                PermissionID.ANALYSIS_RESULT_READ,
+                PermissionName.ANALYSIS_RESULT_READ,
 
-                PermissionID.ANALYSIS_EXECUTION_START,
-                PermissionID.ANALYSIS_EXECUTION_STOP,
+                PermissionName.ANALYSIS_EXECUTION_START,
+                PermissionName.ANALYSIS_EXECUTION_STOP,
             ],
         });
 
diff --git a/packages/client-ui/pages/projects/[id]/settings.vue b/packages/client-ui/pages/projects/[id]/settings.vue
index 684290fa8..fcd5322b2 100644
--- a/packages/client-ui/pages/projects/[id]/settings.vue
+++ b/packages/client-ui/pages/projects/[id]/settings.vue
@@ -6,7 +6,7 @@
   -->
 <script lang="ts">
 import type { Project } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import { FProjectForm } from '@privateaim/client-vue';
 import { defineNuxtComponent } from '#app';
@@ -17,8 +17,8 @@ export default defineNuxtComponent({
         [LayoutKey.REQUIRED_LOGGED_IN]: true,
         [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
         [LayoutKey.REQUIRED_PERMISSIONS]: [
-            PermissionID.PROJECT_EDIT,
-            PermissionID.PROJECT_DROP,
+            PermissionName.PROJECT_UPDATE,
+            PermissionName.PROJECT_DELETE,
         ],
     },
     components: { FProjectForm },
diff --git a/packages/client-ui/pages/projects/index/add.vue b/packages/client-ui/pages/projects/index/add.vue
index 6d996c07d..e1631affa 100644
--- a/packages/client-ui/pages/projects/index/add.vue
+++ b/packages/client-ui/pages/projects/index/add.vue
@@ -6,11 +6,8 @@
   -->
 <script lang="ts">
 import type { Project } from '@privateaim/core-kit';
-import {
-    PermissionID,
-} from '@privateaim/core-kit';
-
 import { FProjectForm } from '@privateaim/client-vue';
+import { PermissionName } from '@privateaim/kit';
 import { definePageMeta } from '#imports';
 import { defineNuxtComponent } from '#app';
 import { LayoutKey, LayoutNavigationID } from '~/config/layout';
@@ -25,7 +22,7 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.PROJECT_ADD,
+                PermissionName.PROJECT_CREATE,
             ],
         });
         const handleCreated = (entity: Project) => {
diff --git a/packages/client-ui/pages/projects/index/in.vue b/packages/client-ui/pages/projects/index/in.vue
index a8cd68a95..5ab5bbb3b 100644
--- a/packages/client-ui/pages/projects/index/in.vue
+++ b/packages/client-ui/pages/projects/index/in.vue
@@ -6,11 +6,9 @@
   -->
 <script lang="ts">
 import { useAbilityCheck, useStore } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type { ProjectNode } from '@privateaim/core-kit';
-import {
-    PermissionID,
-} from '@privateaim/core-kit';
 import {
     BDropdown, BDropdownDivider, BDropdownItem, BModal, BSpinner, BTable,
 } from 'bootstrap-vue-next';
@@ -52,7 +50,7 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.PROJECT_APPROVE,
+                PermissionName.PROJECT_APPROVE,
             ],
         });
 
@@ -82,7 +80,7 @@ export default defineNuxtComponent({
         const store = useStore();
         const { realmId } = storeToRefs(store);
 
-        const canManage = useAbilityCheck(PermissionID.PROJECT_APPROVE);
+        const canManage = useAbilityCheck(PermissionName.PROJECT_APPROVE);
 
         const nodeId : Ref<string | null> = ref(null);
 
diff --git a/packages/client-ui/pages/projects/index/index.vue b/packages/client-ui/pages/projects/index/index.vue
index df8246da8..c038a75a2 100644
--- a/packages/client-ui/pages/projects/index/index.vue
+++ b/packages/client-ui/pages/projects/index/index.vue
@@ -5,13 +5,13 @@
   - view the LICENSE file that was distributed with this source code.
   -->
 <script>
-import { PermissionID } from '@privateaim/core-kit';
 import { computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import {
     FPagination, FProjectItem, FProjects, FSearch, FTitle,
 } from '@privateaim/client-vue';
 import { useStore } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { LayoutKey, LayoutNavigationID } from '~/config/layout';
 import { defineNuxtComponent, definePageMeta } from '#imports';
 
@@ -24,18 +24,18 @@ export default defineNuxtComponent({
             [LayoutKey.REQUIRED_LOGGED_IN]: true,
             [LayoutKey.NAVIGATION_ID]: LayoutNavigationID.DEFAULT,
             [LayoutKey.REQUIRED_PERMISSIONS]: [
-                PermissionID.PROJECT_ADD,
-                PermissionID.PROJECT_DROP,
-                PermissionID.PROJECT_EDIT,
+                PermissionName.PROJECT_CREATE,
+                PermissionName.PROJECT_DELETE,
+                PermissionName.PROJECT_UPDATE,
 
-                PermissionID.ANALYSIS_ADD,
-                PermissionID.ANALYSIS_EDIT,
-                PermissionID.ANALYSIS_DROP,
+                PermissionName.ANALYSIS_CREATE,
+                PermissionName.ANALYSIS_UPDATE,
+                PermissionName.ANALYSIS_DELETE,
 
-                PermissionID.ANALYSIS_RESULT_READ,
+                PermissionName.ANALYSIS_RESULT_READ,
 
-                PermissionID.ANALYSIS_EXECUTION_START,
-                PermissionID.ANALYSIS_EXECUTION_STOP,
+                PermissionName.ANALYSIS_EXECUTION_START,
+                PermissionName.ANALYSIS_EXECUTION_STOP,
             ],
         });
 
diff --git a/packages/client-vue/src/components/analysis-node/FAnalsisNodeApprovalCommand.ts b/packages/client-vue/src/components/analysis-node/FAnalsisNodeApprovalCommand.ts
index d5d8c8a5a..bfd9df1db 100644
--- a/packages/client-vue/src/components/analysis-node/FAnalsisNodeApprovalCommand.ts
+++ b/packages/client-vue/src/components/analysis-node/FAnalsisNodeApprovalCommand.ts
@@ -5,7 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 import { useAbilityCheck } from '@authup/client-web-kit';
-import { AnalysisNodeApprovalCommand, AnalysisNodeApprovalStatus, PermissionID } from '@privateaim/core-kit';
+import { AnalysisNodeApprovalCommand, AnalysisNodeApprovalStatus } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import { computed, defineComponent, ref } from 'vue';
 import type { ActionCommandProperties } from '../../core';
@@ -122,7 +123,7 @@ export default defineComponent({
             busy.value = false;
         };
 
-        const isAllowed = useAbilityCheck(PermissionID.ANALYSIS_APPROVE);
+        const isAllowed = useAbilityCheck(PermissionName.ANALYSIS_APPROVE);
 
         return () => renderActionCommand({
             execute,
diff --git a/packages/client-vue/src/components/analysis/FAnalysisCommand.ts b/packages/client-vue/src/components/analysis/FAnalysisCommand.ts
index 0299cf490..3151a5388 100644
--- a/packages/client-vue/src/components/analysis/FAnalysisCommand.ts
+++ b/packages/client-vue/src/components/analysis/FAnalysisCommand.ts
@@ -7,7 +7,8 @@
 
 import { useAbilityCheck } from '@authup/client-web-kit';
 import type { Analysis } from '@privateaim/core-kit';
-import { AnalysisAPICommand, AnalysisBuildStatus, PermissionID } from '@privateaim/core-kit';
+import { AnalysisAPICommand, AnalysisBuildStatus } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import {
     computed, defineComponent, ref, toRef,
@@ -64,7 +65,7 @@ const FAnalysisCommand = defineComponent({
             }
         });
 
-        const isAllowed = useAbilityCheck(PermissionID.ANALYSIS_EDIT);
+        const isAllowed = useAbilityCheck(PermissionName.ANALYSIS_UPDATE);
 
         const isHidden = computed<boolean>(() => {
             if (props.command === AnalysisAPICommand.CONFIGURATION_LOCK) {
diff --git a/packages/client-vue/src/components/analysis/FAnalysisItem.ts b/packages/client-vue/src/components/analysis/FAnalysisItem.ts
index 121ff05ed..f1efd2f86 100644
--- a/packages/client-vue/src/components/analysis/FAnalysisItem.ts
+++ b/packages/client-vue/src/components/analysis/FAnalysisItem.ts
@@ -6,6 +6,7 @@
  */
 
 import { useAbilityCheck } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type { PropType, VNodeArrayChildren, VNodeChild } from 'vue';
 import {
@@ -14,9 +15,6 @@ import {
 import type {
     Analysis,
 } from '@privateaim/core-kit';
-import {
-    PermissionID,
-} from '@privateaim/core-kit';
 import { VCLink } from '@vuecs/link';
 import TrainEntity from './FAnalysis';
 import TrainPipeline from './FAnalysisPipeline.vue';
@@ -48,7 +46,7 @@ const FAnalysisItem = defineComponent({
             emit('executed', component, command);
         };
 
-        const isAllowed = useAbilityCheck(PermissionID.ANALYSIS_DROP);
+        const isAllowed = useAbilityCheck(PermissionName.ANALYSIS_DELETE);
 
         return () => h(TrainEntity, {
             entity: props.entity,
diff --git a/packages/client-vue/src/components/project-node/FProjectNodeApprovalCommand.ts b/packages/client-vue/src/components/project-node/FProjectNodeApprovalCommand.ts
index e71615248..95b1c9d63 100644
--- a/packages/client-vue/src/components/project-node/FProjectNodeApprovalCommand.ts
+++ b/packages/client-vue/src/components/project-node/FProjectNodeApprovalCommand.ts
@@ -6,10 +6,10 @@
  */
 import { useAbilityCheck } from '@authup/client-web-kit';
 import {
-    PermissionID,
     ProjectNodeApprovalCommand,
     ProjectNodeApprovalStatus,
 } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { PropType } from 'vue';
 import {
     computed, defineComponent, ref,
@@ -125,7 +125,7 @@ export default defineComponent({
             }
         });
 
-        const isAllowed = useAbilityCheck(PermissionID.PROJECT_APPROVE);
+        const isAllowed = useAbilityCheck(PermissionName.PROJECT_APPROVE);
 
         return () => renderActionCommand({
             execute,
diff --git a/packages/client-vue/src/components/project/FProjectItem.ts b/packages/client-vue/src/components/project/FProjectItem.ts
index 56cd4c1b7..0fbf20658 100644
--- a/packages/client-vue/src/components/project/FProjectItem.ts
+++ b/packages/client-vue/src/components/project/FProjectItem.ts
@@ -5,6 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 import { useAbilityCheck } from '@authup/client-web-kit';
+import { PermissionName } from '@privateaim/kit';
 import { VCTimeago } from '@vuecs/timeago';
 import type {
     PropType, VNode,
@@ -17,7 +18,6 @@ import type {
 } from '@privateaim/core-kit';
 import {
     DomainType,
-    PermissionID,
 } from '@privateaim/core-kit';
 import { VCLink } from '@vuecs/link';
 import {
@@ -36,7 +36,7 @@ const FProjectItem = defineComponent({
     },
     emits: ['updated', 'failed', 'deleted'],
     setup(props, { slots, emit }) {
-        const canDrop = useAbilityCheck(PermissionID.PROJECT_DROP);
+        const canDrop = useAbilityCheck(PermissionName.PROJECT_DELETE);
 
         return () => h(FProject, {
             entity: props.entity,
diff --git a/packages/core-kit/src/domains/index.ts b/packages/core-kit/src/domains/index.ts
index 525991fd1..d6d9691c9 100644
--- a/packages/core-kit/src/domains/index.ts
+++ b/packages/core-kit/src/domains/index.ts
@@ -11,7 +11,6 @@ export * from './analysis-bucket-file';
 export * from './analysis-log';
 export * from './analysis-node';
 export * from './analysis-permission';
-export * from './permission';
 export * from './realm';
 export * from './master-image-group';
 export * from './master-image';
diff --git a/packages/core-kit/src/domains/permission/constants.ts b/packages/core-kit/src/domains/permission/constants.ts
deleted file mode 100644
index f2abb5ecd..000000000
--- a/packages/core-kit/src/domains/permission/constants.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2021-2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-import { PermissionName as AuthPermissionName } from '@authup/core-kit';
-
-export enum PermissionKey {
-    BUCKET_ADD = 'bucket_add',
-    BUCKET_EDIT = 'bucket_edit',
-    BUCKET_DROP = 'bucket_drop',
-
-    PROJECT_ADD = 'project_add',
-    PROJECT_DROP = 'project_drop',
-    PROJECT_EDIT = 'project_edit',
-    PROJECT_APPROVE = 'project_approve',
-
-    REGISTRY_MANAGE = 'registry_manage',
-    REGISTRY_PROJECT_MANAGE = 'registry_project_manage',
-
-    NODE_ADD = 'node_add',
-    NODE_DROP = 'node_drop',
-    NODE_EDIT = 'node_edit',
-
-    ANALYSIS_APPROVE = 'analysis_approve',
-    ANALYSIS_EDIT = 'analysis_edit',
-    ANALYSIS_ADD = 'analysis_add',
-    ANALYSIS_EXECUTION_START = 'analysis_execution_start',
-    ANALYSIS_EXECUTION_STOP = 'analysis_execution_stop',
-    ANALYSIS_DROP = 'analysis_drop',
-    ANALYSIS_RESULT_READ = 'analysis_result_read', // todo: this is maybe not required anymore
-
-    MASTER_IMAGE_MANAGE = 'master_image_manage',
-    MASTER_IMAGE_GROUP_MANAGE = 'master_image_group_manage',
-
-    SERVICE_MANAGE = 'service_manage',
-}
-
-export const PermissionID = {
-    ...PermissionKey,
-    ...AuthPermissionName,
-};
-
-export type PermissionIDType = typeof PermissionID[keyof typeof PermissionID];
diff --git a/packages/core-kit/src/domains/permission/index.ts b/packages/core-kit/src/domains/permission/index.ts
deleted file mode 100644
index 54d39d078..000000000
--- a/packages/core-kit/src/domains/permission/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2021-2024.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */
-
-export * from './constants';
diff --git a/packages/kit/src/domains/permission/constants.ts b/packages/kit/src/domains/permission/constants.ts
index f2abb5ecd..e9abc0385 100644
--- a/packages/kit/src/domains/permission/constants.ts
+++ b/packages/kit/src/domains/permission/constants.ts
@@ -7,29 +7,29 @@
 
 import { PermissionName as AuthPermissionName } from '@authup/core-kit';
 
-export enum PermissionKey {
-    BUCKET_ADD = 'bucket_add',
-    BUCKET_EDIT = 'bucket_edit',
-    BUCKET_DROP = 'bucket_drop',
-
-    PROJECT_ADD = 'project_add',
-    PROJECT_DROP = 'project_drop',
-    PROJECT_EDIT = 'project_edit',
+export enum PermissionName {
+    BUCKET_CREATE = 'bucket_create',
+    BUCKET_UPDATE = 'bucket_update',
+    BUCKET_DELETE = 'bucket_delete',
+
+    PROJECT_CREATE = 'project_create',
+    PROJECT_DELETE = 'project_delete',
+    PROJECT_UPDATE = 'project_update',
     PROJECT_APPROVE = 'project_approve',
 
     REGISTRY_MANAGE = 'registry_manage',
     REGISTRY_PROJECT_MANAGE = 'registry_project_manage',
 
-    NODE_ADD = 'node_add',
-    NODE_DROP = 'node_drop',
-    NODE_EDIT = 'node_edit',
+    NODE_CREATE = 'node_create',
+    NODE_DELETE = 'node_delete',
+    NODE_UPDATE = 'node_update',
 
     ANALYSIS_APPROVE = 'analysis_approve',
-    ANALYSIS_EDIT = 'analysis_edit',
-    ANALYSIS_ADD = 'analysis_add',
+    ANALYSIS_UPDATE = 'analysis_update',
+    ANALYSIS_CREATE = 'analysis_create',
     ANALYSIS_EXECUTION_START = 'analysis_execution_start',
     ANALYSIS_EXECUTION_STOP = 'analysis_execution_stop',
-    ANALYSIS_DROP = 'analysis_drop',
+    ANALYSIS_DELETE = 'analysis_delete',
     ANALYSIS_RESULT_READ = 'analysis_result_read', // todo: this is maybe not required anymore
 
     MASTER_IMAGE_MANAGE = 'master_image_manage',
@@ -37,10 +37,3 @@ export enum PermissionKey {
 
     SERVICE_MANAGE = 'service_manage',
 }
-
-export const PermissionID = {
-    ...PermissionKey,
-    ...AuthPermissionName,
-};
-
-export type PermissionIDType = typeof PermissionID[keyof typeof PermissionID];
diff --git a/packages/server-core-realtime/package.json b/packages/server-core-realtime/package.json
index 20d0499ea..2c8ee0b9f 100644
--- a/packages/server-core-realtime/package.json
+++ b/packages/server-core-realtime/package.json
@@ -15,6 +15,7 @@
         "@authup/kit": "^1.0.0-beta.19",
         "@authup/core-kit": "^1.0.0-beta.19",
         "@ebec/http": "^2.3.0",
+        "@privateaim/kit": "^0.7.0",
         "@privateaim/core-kit": "^0.7.0",
         "@privateaim/core-realtime-kit": "^0.7.0",
         "@privateaim/server-kit": "^0.7.0",
diff --git a/packages/server-core-realtime/src/socket/controllers/analysis-file/handlers.ts b/packages/server-core-realtime/src/socket/controllers/analysis-file/handlers.ts
index bcb805a35..576839b34 100644
--- a/packages/server-core-realtime/src/socket/controllers/analysis-file/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/analysis-file/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -30,7 +30,7 @@ export function registerAnalysisFileSocketHandlers(socket: Socket) {
     socket.on(
         buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_BUCKET_FILE, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
-            if (!socket.data.abilities.has(PermissionID.ANALYSIS_EDIT)) {
+            if (!socket.data.abilities.has(PermissionName.ANALYSIS_UPDATE)) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
                 }
diff --git a/packages/server-core-realtime/src/socket/controllers/analysis-log/handlers.ts b/packages/server-core-realtime/src/socket/controllers/analysis-log/handlers.ts
index dac2d75cc..2e3562da2 100644
--- a/packages/server-core-realtime/src/socket/controllers/analysis-log/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/analysis-log/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -30,7 +30,7 @@ export function registerAnalysisLogSocketHandlers(socket: Socket) {
     socket.on(
         buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_LOG, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
-            if (!socket.data.abilities.has(PermissionID.ANALYSIS_EDIT)) {
+            if (!socket.data.abilities.has(PermissionName.ANALYSIS_UPDATE)) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
                 }
diff --git a/packages/server-core-realtime/src/socket/controllers/analysis-node/handlers.ts b/packages/server-core-realtime/src/socket/controllers/analysis-node/handlers.ts
index 09379bbf5..b1fba2eb6 100644
--- a/packages/server-core-realtime/src/socket/controllers/analysis-node/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/analysis-node/handlers.ts
@@ -9,7 +9,6 @@ import {
     DomainEventSubscriptionName,
     DomainSubType,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -17,6 +16,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -34,7 +34,7 @@ export function registerAnalysisNodeSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.ANALYSIS_NODE, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.ANALYSIS_APPROVE)
+                !socket.data.abilities.has(PermissionName.ANALYSIS_APPROVE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
@@ -68,7 +68,7 @@ export function registerAnalysisNodeForRealmSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainSubType.ANALYSIS_NODE_IN, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.ANALYSIS_APPROVE)
+                !socket.data.abilities.has(PermissionName.ANALYSIS_APPROVE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
@@ -97,7 +97,7 @@ export function registerAnalysisNodeForRealmSocketHandlers(socket: Socket) {
     socket.on(
         buildDomainEventSubscriptionFullName(DomainSubType.ANALYSIS_NODE_OUT, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
-            if (!socket.data.abilities.has(PermissionID.ANALYSIS_EDIT)) {
+            if (!socket.data.abilities.has(PermissionName.ANALYSIS_UPDATE)) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
                 }
diff --git a/packages/server-core-realtime/src/socket/controllers/analysis/handlers.ts b/packages/server-core-realtime/src/socket/controllers/analysis/handlers.ts
index 9e7c0baa0..0ec3ec345 100644
--- a/packages/server-core-realtime/src/socket/controllers/analysis/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/analysis/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -29,9 +29,9 @@ export function registerAnalysisSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.ANALYSIS, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.ANALYSIS_EDIT) &&
-                !socket.data.abilities.has(PermissionID.ANALYSIS_EXECUTION_START) &&
-                !socket.data.abilities.has(PermissionID.ANALYSIS_EXECUTION_STOP)
+                !socket.data.abilities.has(PermissionName.ANALYSIS_UPDATE) &&
+                !socket.data.abilities.has(PermissionName.ANALYSIS_EXECUTION_START) &&
+                !socket.data.abilities.has(PermissionName.ANALYSIS_EXECUTION_STOP)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
diff --git a/packages/server-core-realtime/src/socket/controllers/node/handlers.ts b/packages/server-core-realtime/src/socket/controllers/node/handlers.ts
index 908f1d787..a70afcc18 100644
--- a/packages/server-core-realtime/src/socket/controllers/node/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/node/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -29,7 +29,7 @@ export function registerNodeSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.NODE, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.NODE_EDIT)
+                !socket.data.abilities.has(PermissionName.NODE_UPDATE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
diff --git a/packages/server-core-realtime/src/socket/controllers/project-node/handlers.ts b/packages/server-core-realtime/src/socket/controllers/project-node/handlers.ts
index c0391462f..fd1bcbb33 100644
--- a/packages/server-core-realtime/src/socket/controllers/project-node/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/project-node/handlers.ts
@@ -9,7 +9,6 @@ import {
     DomainEventSubscriptionName,
     DomainSubType,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -17,6 +16,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -34,7 +34,7 @@ export function registerProjectNodeSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.PROJECT_NODE, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.PROJECT_APPROVE)
+                !socket.data.abilities.has(PermissionName.PROJECT_APPROVE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
@@ -68,7 +68,7 @@ export function registerProjectNodeForRealmSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainSubType.PROJECT_NODE_IN, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.PROJECT_APPROVE)
+                !socket.data.abilities.has(PermissionName.PROJECT_APPROVE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
@@ -104,7 +104,7 @@ export function registerProjectNodeForRealmSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainSubType.PROJECT_NODE_OUT, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.PROJECT_EDIT)
+                !socket.data.abilities.has(PermissionName.PROJECT_UPDATE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
diff --git a/packages/server-core-realtime/src/socket/controllers/project/handlers.ts b/packages/server-core-realtime/src/socket/controllers/project/handlers.ts
index 2e4a5682d..72b68e572 100644
--- a/packages/server-core-realtime/src/socket/controllers/project/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/project/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -31,8 +31,8 @@ export function registerProjectSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.PROJECT, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.PROJECT_DROP) &&
-                !socket.data.abilities.has(PermissionID.PROJECT_EDIT)
+                !socket.data.abilities.has(PermissionName.PROJECT_DELETE) &&
+                !socket.data.abilities.has(PermissionName.PROJECT_UPDATE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
diff --git a/packages/server-core-realtime/src/socket/controllers/registry-project/handlers.ts b/packages/server-core-realtime/src/socket/controllers/registry-project/handlers.ts
index 6db21840b..9290c9178 100644
--- a/packages/server-core-realtime/src/socket/controllers/registry-project/handlers.ts
+++ b/packages/server-core-realtime/src/socket/controllers/registry-project/handlers.ts
@@ -8,7 +8,6 @@
 import {
     DomainEventSubscriptionName,
     DomainType,
-    PermissionID,
     buildDomainChannelName,
     buildDomainEventSubscriptionFullName,
 } from '@privateaim/core-kit';
@@ -16,6 +15,7 @@ import {
     isEventCallback,
 } from '@privateaim/core-realtime-kit';
 import { UnauthorizedError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import {
     subscribeSocketRoom,
     unsubscribeSocketRoom,
@@ -31,7 +31,7 @@ export function registerRegistryProjectSocketHandlers(socket: Socket) {
         buildDomainEventSubscriptionFullName(DomainType.REGISTRY_PROJECT, DomainEventSubscriptionName.SUBSCRIBE),
         async (target, cb) => {
             if (
-                !socket.data.abilities.has(PermissionID.REGISTRY_MANAGE)
+                !socket.data.abilities.has(PermissionName.REGISTRY_MANAGE)
             ) {
                 if (isEventCallback(cb)) {
                     cb(new UnauthorizedError());
diff --git a/packages/server-core-realtime/tsconfig.json b/packages/server-core-realtime/tsconfig.json
index 7a9576db8..9ea5915a9 100644
--- a/packages/server-core-realtime/tsconfig.json
+++ b/packages/server-core-realtime/tsconfig.json
@@ -2,18 +2,11 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "paths": {
-            "@privateaim/core-kit": [
-                "./packages/core-kit/src"
-            ],
-            "@privateaim/core-realtime-kit": [
-                "./packages/core-realtime-kit/src"
-            ],
-            "@privateaim/server-kit": [
-                "./packages/server-kit/src"
-            ],
-            "@privateaim/server-realtime-kit": [
-                "./packages/server-realtime-kit/src"
-            ]
+            "@privateaim/kit": ["./packages/kit/src"],
+            "@privateaim/core-kit": ["./packages/core-kit/src"],
+            "@privateaim/core-realtime-kit": ["./packages/core-realtime-kit/src"],
+            "@privateaim/server-kit": ["./packages/server-kit/src"],
+            "@privateaim/server-realtime-kit": ["./packages/server-realtime-kit/src"]
         }
     }
 }
diff --git a/packages/server-core/src/core/authup/setup.ts b/packages/server-core/src/core/authup/setup.ts
index 2d34444e9..2ca0e1784 100644
--- a/packages/server-core/src/core/authup/setup.ts
+++ b/packages/server-core/src/core/authup/setup.ts
@@ -6,12 +6,13 @@
  */
 
 import type {
-    Permission, Realm, Robot, Role,
+    Realm,
 } from '@authup/core-kit';
 import { REALM_MASTER_NAME } from '@authup/core-kit';
 import { ServerError } from '@ebec/http';
 import { isClientErrorWithStatusCode } from '@hapic/harbor';
-import { PermissionKey, ServiceID } from '@privateaim/core-kit';
+import { ServiceID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import { useAuthupClient, useLogger } from '@privateaim/server-kit';
 
 export async function setupAuthupService(): Promise<any> {
@@ -30,36 +31,6 @@ export async function setupAuthupService(): Promise<any> {
 
     // -------------------------------------------------
 
-    let robotEntity: Robot | undefined;
-    const robotResponse = await authupClient.robot.getMany({
-        filter: {
-            realm_id: realm.id,
-            name: 'system',
-        },
-    });
-
-    if (robotResponse.data.length === 1) {
-        // eslint-disable-next-line prefer-destructuring
-        robotEntity = robotResponse.data[0];
-    }
-
-    // -------------------------------------------------
-
-    let roleEntity: Role | undefined;
-    const roleResponse = await authupClient.role.getMany({
-        filter: {
-            realm_id: null,
-            name: 'admin',
-        },
-    });
-
-    if (roleResponse.data.length === 1) {
-        // eslint-disable-next-line prefer-destructuring
-        roleEntity = roleResponse.data[0];
-    }
-
-    // -------------------------------------------------
-
     /**
      * Create registry robot account.
      */
@@ -86,12 +57,10 @@ export async function setupAuthupService(): Promise<any> {
     /**
      * Create permissions
      */
-    const permissionNames = Object.values(PermissionKey);
+    const permissionNames = Object.values(PermissionName);
     for (let i = 0; i < permissionNames.length; i++) {
-        let permission: Permission;
-
         try {
-            permission = await authupClient.permission.create({
+            await authupClient.permission.create({
                 name: permissionNames[i],
             });
 
@@ -99,49 +68,9 @@ export async function setupAuthupService(): Promise<any> {
         } catch (e) {
             if (isClientErrorWithStatusCode(e, 409)) {
                 useLogger().debug(`Permission ${permissionNames[i]} already exists`);
-
-                const { data: permissions } = await authupClient.permission.getMany({
-                    filter: {
-                        realm_id: null,
-                        name: permissionNames[i],
-                    },
-                });
-
-                // eslint-disable-next-line prefer-destructuring
-                permission = permissions[0];
             } else {
                 throw e;
             }
         }
-
-        if (roleEntity) {
-            try {
-                await authupClient.rolePermission.create({
-                    permission_id: permission.id,
-                    role_id: roleEntity.id,
-                });
-
-                useLogger().debug(`Created permission ${permissionNames[i]} for admin role.`);
-            } catch (e) {
-                if (!isClientErrorWithStatusCode(e, 409)) {
-                    throw e;
-                }
-            }
-        }
-
-        if (robotEntity) {
-            try {
-                await authupClient.robotPermission.create({
-                    permission_id: permission.id,
-                    robot_id: robotEntity.id,
-                });
-
-                useLogger().debug(`Created permission ${permissionNames[i]} for system robot.`);
-            } catch (e) {
-                if (!isClientErrorWithStatusCode(e, 409)) {
-                    throw e;
-                }
-            }
-        }
     }
 }
diff --git a/packages/server-core/src/http/controllers/core/analysis-log/handlers/delete.ts b/packages/server-core/src/http/controllers/core/analysis-log/handlers/delete.ts
index 05eb8e269..21b5971fc 100644
--- a/packages/server-core/src/http/controllers/core/analysis-log/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-log/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -18,7 +18,7 @@ export async function deleteAnalysisLogRouteHandler(req: Request, res: Response)
 
     const ability = useRequestEnv(req, 'abilities');
     if (
-        !ability.has(PermissionID.ANALYSIS_EDIT)
+        !ability.has(PermissionName.ANALYSIS_UPDATE)
     ) {
         throw new ForbiddenError();
     }
diff --git a/packages/server-core/src/http/controllers/core/analysis-node/handlers/create.ts b/packages/server-core/src/http/controllers/core/analysis-node/handlers/create.ts
index c04191e9f..dd9d15cd7 100644
--- a/packages/server-core/src/http/controllers/core/analysis-node/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-node/handlers/create.ts
@@ -6,7 +6,8 @@
  */
 
 import { BadRequestError, ForbiddenError } from '@ebec/http';
-import { AnalysisNodeApprovalStatus, NodeType, PermissionID } from '@privateaim/core-kit';
+import { AnalysisNodeApprovalStatus, NodeType } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +18,7 @@ import { runAnalysisNodeValidation } from '../utils';
 
 export async function createAnalysisNodeRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_EDIT)) {
+    if (!ability.has(PermissionName.ANALYSIS_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis-node/handlers/delete.ts b/packages/server-core/src/http/controllers/core/analysis-node/handlers/delete.ts
index 4eb0b3165..43f8e75ae 100644
--- a/packages/server-core/src/http/controllers/core/analysis-node/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-node/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { MoreThan } from 'typeorm';
@@ -20,8 +20,8 @@ export async function deleteAnalysisNodeRouteHandler(req: Request, res: Response
 
     const ability = useRequestEnv(req, 'abilities');
     if (
-        !ability.has(PermissionID.ANALYSIS_EDIT) &&
-        !ability.has(PermissionID.ANALYSIS_APPROVE)
+        !ability.has(PermissionName.ANALYSIS_UPDATE) &&
+        !ability.has(PermissionName.ANALYSIS_APPROVE)
     ) {
         throw new ForbiddenError();
     }
diff --git a/packages/server-core/src/http/controllers/core/analysis-node/handlers/update.ts b/packages/server-core/src/http/controllers/core/analysis-node/handlers/update.ts
index 514dfc1f1..aac30e6c5 100644
--- a/packages/server-core/src/http/controllers/core/analysis-node/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-node/handlers/update.ts
@@ -7,7 +7,7 @@
 
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -29,10 +29,10 @@ export async function updateAnalysisNodeRouteHandler(req: Request, res: Response
     const ability = useRequestEnv(req, 'abilities');
 
     const isAuthorityOfNode = isRealmResourceWritable(useRequestEnv(req, 'realm'), entity.node_realm_id);
-    const isAuthorizedForNode = ability.has(PermissionID.ANALYSIS_APPROVE);
+    const isAuthorizedForNode = ability.has(PermissionName.ANALYSIS_APPROVE);
 
     const isAuthorityOfAnalysis = isRealmResourceWritable(useRequestEnv(req, 'realm'), entity.analysis_realm_id);
-    const isAuthorizedForAnalysis = ability.has(PermissionID.ANALYSIS_EDIT);
+    const isAuthorizedForAnalysis = ability.has(PermissionName.ANALYSIS_UPDATE);
 
     if (
         !(isAuthorityOfNode && isAuthorizedForNode) &&
diff --git a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/create.ts b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/create.ts
index 480ce1bf3..4143c0de9 100644
--- a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/create.ts
@@ -6,7 +6,7 @@
  */
 
 import { ForbiddenError } from '@ebec/http';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -16,7 +16,7 @@ import { runAnalysisPermissionValidation } from '../utils';
 
 export async function createAnalysisPermissionRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_EDIT)) {
+    if (!ability.has(PermissionName.ANALYSIS_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/delete.ts b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/delete.ts
index 9fc5d39c0..b097c09ae 100644
--- a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { isRealmResourceWritable } from '@authup/core-kit';
@@ -18,7 +18,7 @@ export async function deleteAnalysisPermissionRouteHandler(req: Request, res: Re
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_EDIT)) {
+    if (!ability.has(PermissionName.ANALYSIS_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/update.ts b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/update.ts
index 41e39d568..504e61d14 100644
--- a/packages/server-core/src/http/controllers/core/analysis-permission/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/analysis-permission/handlers/update.ts
@@ -7,7 +7,7 @@
 
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +17,7 @@ import { runAnalysisPermissionValidation } from '../utils';
 
 export async function updateAnalysisPermissionRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_EDIT)) {
+    if (!ability.has(PermissionName.ANALYSIS_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis/handlers/create.ts b/packages/server-core/src/http/controllers/core/analysis/handlers/create.ts
index 0adc9629c..c34da161e 100644
--- a/packages/server-core/src/http/controllers/core/analysis/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/analysis/handlers/create.ts
@@ -6,8 +6,8 @@
  */
 
 import type { Analysis } from '@privateaim/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +17,7 @@ import { AnalysisEntity, ProjectEntity, runAnalysisSpinUpCommand } from '../../.
 
 export async function createAnalysisRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_ADD)) {
+    if (!ability.has(PermissionName.ANALYSIS_CREATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis/handlers/delete.ts b/packages/server-core/src/http/controllers/core/analysis/handlers/delete.ts
index 88d4c701c..035902a46 100644
--- a/packages/server-core/src/http/controllers/core/analysis/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/analysis/handlers/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { ForbiddenError, NotFoundError } from '@ebec/http';
-import { PermissionID } from '@privateaim/core-kit';
 import { isRealmResourceWritable } from '@authup/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -19,7 +19,7 @@ export async function deleteAnalysisRouteHandler(req: Request, res: Response) :
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_DROP)) {
+    if (!ability.has(PermissionName.ANALYSIS_DELETE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/analysis/handlers/update.ts b/packages/server-core/src/http/controllers/core/analysis/handlers/update.ts
index 9ed6c6dc7..8b9744549 100644
--- a/packages/server-core/src/http/controllers/core/analysis/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/analysis/handlers/update.ts
@@ -7,7 +7,7 @@
 
 import { isRealmResourceWritable } from '@authup/core-kit';
 import { BadRequestError, ForbiddenError, NotFoundError } from '@ebec/http';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -19,7 +19,7 @@ export async function updateAnalysisRouteHandler(req: Request, res: Response) :
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.ANALYSIS_EDIT)) {
+    if (!ability.has(PermissionName.ANALYSIS_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/master-image-group/handlers/delete.ts b/packages/server-core/src/http/controllers/core/master-image-group/handlers/delete.ts
index cd6f535fe..f96270706 100644
--- a/packages/server-core/src/http/controllers/core/master-image-group/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/master-image-group/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +17,7 @@ export async function deleteMasterImageGroupRouteHandler(req: Request, res: Resp
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.MASTER_IMAGE_GROUP_MANAGE)) {
+    if (!ability.has(PermissionName.MASTER_IMAGE_GROUP_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/master-image/handlers/delete.ts b/packages/server-core/src/http/controllers/core/master-image/handlers/delete.ts
index 5a1c13d12..6d658b07f 100644
--- a/packages/server-core/src/http/controllers/core/master-image/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/master-image/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +17,7 @@ export async function deleteMasterImageRouteHandler(req: Request, res: Response)
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.MASTER_IMAGE_MANAGE)) {
+    if (!ability.has(PermissionName.MASTER_IMAGE_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/node/handlers/create.ts b/packages/server-core/src/http/controllers/core/node/handlers/create.ts
index 0ee752f81..cdcd63abd 100644
--- a/packages/server-core/src/http/controllers/core/node/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/node/handlers/create.ts
@@ -6,10 +6,9 @@
  */
 
 import {
-    PermissionID,
     RegistryProjectType,
 } from '@privateaim/core-kit';
-import { createNanoID } from '@privateaim/kit';
+import { PermissionName, createNanoID } from '@privateaim/kit';
 import { ForbiddenError } from '@ebec/http';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
@@ -22,7 +21,7 @@ import { NodeEntity, RegistryEntity, RegistryProjectEntity } from '../../../../.
 
 export async function createNodeRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.NODE_ADD)) {
+    if (!ability.has(PermissionName.NODE_CREATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/node/handlers/delete.ts b/packages/server-core/src/http/controllers/core/node/handlers/delete.ts
index fa241e638..4df339514 100644
--- a/packages/server-core/src/http/controllers/core/node/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/node/handlers/delete.ts
@@ -6,8 +6,8 @@
  */
 
 import { ForbiddenError, NotFoundError } from '@ebec/http';
-import { PermissionID } from '@privateaim/core-kit';
 import { isRealmResourceWritable } from '@authup/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -21,7 +21,7 @@ export async function deleteNodeRouteHandler(req: Request, res: Response) : Prom
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.NODE_DROP)) {
+    if (!ability.has(PermissionName.NODE_DELETE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/node/handlers/update.ts b/packages/server-core/src/http/controllers/core/node/handlers/update.ts
index 4de2e3af0..aa65dfdb3 100644
--- a/packages/server-core/src/http/controllers/core/node/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/node/handlers/update.ts
@@ -6,9 +6,9 @@
  */
 
 import {
-    PermissionID, RegistryProjectType,
+    RegistryProjectType,
 } from '@privateaim/core-kit';
-import { createNanoID } from '@privateaim/kit';
+import { PermissionName, createNanoID } from '@privateaim/kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
@@ -24,7 +24,7 @@ export async function updateNodeRouteHandler(req: Request, res: Response) : Prom
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.NODE_EDIT)) {
+    if (!ability.has(PermissionName.NODE_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/project-node/handlers/create.ts b/packages/server-core/src/http/controllers/core/project-node/handlers/create.ts
index 1e9d8b703..376275f00 100644
--- a/packages/server-core/src/http/controllers/core/project-node/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/project-node/handlers/create.ts
@@ -5,8 +5,9 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { NodeType, PermissionID, ProjectNodeApprovalStatus } from '@privateaim/core-kit';
+import { NodeType, ProjectNodeApprovalStatus } from '@privateaim/core-kit';
 import { ForbiddenError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -19,8 +20,8 @@ export async function createProjectNodeRouteHandler(req: Request, res: Response)
     const ability = useRequestEnv(req, 'abilities');
 
     if (
-        !ability.has(PermissionID.PROJECT_EDIT) &&
-        !ability.has(PermissionID.PROJECT_ADD)
+        !ability.has(PermissionName.PROJECT_UPDATE) &&
+        !ability.has(PermissionName.PROJECT_CREATE)
     ) {
         throw new ForbiddenError('You are not allowed to add a project node.');
     }
diff --git a/packages/server-core/src/http/controllers/core/project-node/handlers/delete.ts b/packages/server-core/src/http/controllers/core/project-node/handlers/delete.ts
index 27089f6bf..10649540f 100644
--- a/packages/server-core/src/http/controllers/core/project-node/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/project-node/handlers/delete.ts
@@ -5,9 +5,9 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -20,8 +20,8 @@ export async function deleteProjectNodeRouteHandler(req: Request, res: Response)
     const ability = useRequestEnv(req, 'abilities');
 
     if (
-        !ability.has(PermissionID.PROJECT_EDIT) &&
-        !ability.has(PermissionID.PROJECT_DROP)
+        !ability.has(PermissionName.PROJECT_UPDATE) &&
+        !ability.has(PermissionName.PROJECT_DELETE)
     ) {
         throw new ForbiddenError('You are not allowed to drop a project node.');
     }
diff --git a/packages/server-core/src/http/controllers/core/project-node/handlers/update.ts b/packages/server-core/src/http/controllers/core/project-node/handlers/update.ts
index 06d7ef937..4468cb257 100644
--- a/packages/server-core/src/http/controllers/core/project-node/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/project-node/handlers/update.ts
@@ -7,7 +7,7 @@
 
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
-import { PermissionID } from '@privateaim/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -29,7 +29,7 @@ export async function updateProjectNodeRouteHandler(req: Request, res: Response)
     const ability = useRequestEnv(req, 'abilities');
 
     const isAuthorityOfNode = isRealmResourceWritable(useRequestEnv(req, 'realm'), entity.node_realm_id);
-    const isAuthorizedForNode = ability.has(PermissionID.PROJECT_APPROVE);
+    const isAuthorizedForNode = ability.has(PermissionName.PROJECT_APPROVE);
 
     const isAuthorityOfProject = isRealmResourceWritable(useRequestEnv(req, 'realm'), entity.project_realm_id);
     if (isAuthorityOfProject && !isAuthorityOfNode) {
diff --git a/packages/server-core/src/http/controllers/core/project/handlers/create.ts b/packages/server-core/src/http/controllers/core/project/handlers/create.ts
index 33b5ae6ae..258159a2d 100644
--- a/packages/server-core/src/http/controllers/core/project/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/project/handlers/create.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -16,7 +16,7 @@ import { runProjectValidation } from '../utils/validation';
 
 export async function createProjectRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.PROJECT_ADD)) {
+    if (!ability.has(PermissionName.PROJECT_CREATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/project/handlers/delete.ts b/packages/server-core/src/http/controllers/core/project/handlers/delete.ts
index fd7e90351..e62ade339 100644
--- a/packages/server-core/src/http/controllers/core/project/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/project/handlers/delete.ts
@@ -5,9 +5,9 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { BadRequestError, ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -18,7 +18,7 @@ export async function deleteProjectRouteHandler(req: Request, res: Response) : P
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.PROJECT_DROP)) {
+    if (!ability.has(PermissionName.PROJECT_DELETE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/project/handlers/update.ts b/packages/server-core/src/http/controllers/core/project/handlers/update.ts
index c3c707002..ad3a1debc 100644
--- a/packages/server-core/src/http/controllers/core/project/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/project/handlers/update.ts
@@ -5,9 +5,9 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -19,7 +19,7 @@ export async function updateProjectRouteHandler(req: Request, res: Response) : P
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.PROJECT_EDIT)) {
+    if (!ability.has(PermissionName.PROJECT_UPDATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry-project/handlers/create.ts b/packages/server-core/src/http/controllers/core/registry-project/handlers/create.ts
index 1f176ff27..0396c4582 100644
--- a/packages/server-core/src/http/controllers/core/registry-project/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/registry-project/handlers/create.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -18,7 +18,7 @@ import { RegistryProjectEntity } from '../../../../../domains';
 
 export async function createRegistryProjectRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.REGISTRY_PROJECT_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_PROJECT_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry-project/handlers/delete.ts b/packages/server-core/src/http/controllers/core/registry-project/handlers/delete.ts
index 03b2c40d4..4dc88d8e3 100644
--- a/packages/server-core/src/http/controllers/core/registry-project/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/registry-project/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -20,7 +20,7 @@ export async function deleteRegistryProjectRouteHandler(req: Request, res: Respo
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.REGISTRY_PROJECT_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_PROJECT_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry-project/handlers/read.ts b/packages/server-core/src/http/controllers/core/registry-project/handlers/read.ts
index bad1ca968..12a760c1f 100644
--- a/packages/server-core/src/http/controllers/core/registry-project/handlers/read.ts
+++ b/packages/server-core/src/http/controllers/core/registry-project/handlers/read.ts
@@ -5,6 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+import { PermissionName } from '@privateaim/kit';
 import { useRequestQuery } from '@routup/basic/query';
 import type { ParseAllowedOption } from 'rapiq';
 import { parseQueryFields } from 'rapiq';
@@ -20,7 +21,6 @@ import {
     useDataSource,
 } from 'typeorm-extension';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
-import { PermissionID } from '@privateaim/core-kit';
 import { useRequestEnv } from '@privateaim/server-http-kit';
 import { RegistryProjectEntity, onlyRealmWritableQueryResources } from '../../../../../domains';
 
@@ -57,7 +57,7 @@ function checkAndApplyFields(req: Request, query: SelectQueryBuilder<any>, field
     if (protectedSelected.length > 0) {
         const ability = useRequestEnv(req, 'abilities');
         if (
-            !ability.has(PermissionID.REGISTRY_PROJECT_MANAGE)
+            !ability.has(PermissionName.REGISTRY_PROJECT_MANAGE)
         ) {
             throw new ForbiddenError(
                 `You are not permitted to read the restricted fields: ${
diff --git a/packages/server-core/src/http/controllers/core/registry-project/handlers/update.ts b/packages/server-core/src/http/controllers/core/registry-project/handlers/update.ts
index 1d5d7673d..fe6868773 100644
--- a/packages/server-core/src/http/controllers/core/registry-project/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/registry-project/handlers/update.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -21,7 +21,7 @@ export async function updateRegistryProjectRouteHandler(req: Request, res: Respo
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.REGISTRY_PROJECT_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_PROJECT_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry/handlers/create.ts b/packages/server-core/src/http/controllers/core/registry/handlers/create.ts
index ac5857ada..9fa5bc81a 100644
--- a/packages/server-core/src/http/controllers/core/registry/handlers/create.ts
+++ b/packages/server-core/src/http/controllers/core/registry/handlers/create.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -17,7 +17,7 @@ import { RegistryEntity } from '../../../../../domains';
 export async function createRegistryRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
 
-    if (!ability.has(PermissionID.REGISTRY_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry/handlers/delete.ts b/packages/server-core/src/http/controllers/core/registry/handlers/delete.ts
index dba1e6060..8cccba0e3 100644
--- a/packages/server-core/src/http/controllers/core/registry/handlers/delete.ts
+++ b/packages/server-core/src/http/controllers/core/registry/handlers/delete.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -18,7 +18,7 @@ export async function deleteRegistryRouteHandler(req: Request, res: Response) :
 
     const ability = useRequestEnv(req, 'abilities');
 
-    if (!ability.has(PermissionID.REGISTRY_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/core/registry/handlers/read.ts b/packages/server-core/src/http/controllers/core/registry/handlers/read.ts
index ff18fef36..1f4745167 100644
--- a/packages/server-core/src/http/controllers/core/registry/handlers/read.ts
+++ b/packages/server-core/src/http/controllers/core/registry/handlers/read.ts
@@ -5,6 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+import { PermissionName } from '@privateaim/kit';
 import { useRequestQuery } from '@routup/basic/query';
 import type { Request, Response } from 'routup';
 import { send, useRequestParam } from 'routup';
@@ -15,7 +16,6 @@ import {
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import type { ParseAllowedOption } from 'rapiq';
 import { parseQueryFields } from 'rapiq';
-import { PermissionID } from '@privateaim/core-kit';
 import { useRequestEnv } from '@privateaim/server-http-kit';
 import { RegistryEntity } from '../../../../../domains';
 
@@ -44,7 +44,7 @@ function checkAndApplyFields(req: Request, query: SelectQueryBuilder<any>) {
     const ability = useRequestEnv(req, 'abilities');
     if (protectedSelected.length > 0) {
         if (
-            !ability.has(PermissionID.REGISTRY_MANAGE)
+            !ability.has(PermissionName.REGISTRY_MANAGE)
         ) {
             throw new ForbiddenError(
                 `You are not permitted to read the restricted fields: ${
diff --git a/packages/server-core/src/http/controllers/core/registry/handlers/update.ts b/packages/server-core/src/http/controllers/core/registry/handlers/update.ts
index 0128cdfa9..3ef6753f5 100644
--- a/packages/server-core/src/http/controllers/core/registry/handlers/update.ts
+++ b/packages/server-core/src/http/controllers/core/registry/handlers/update.ts
@@ -5,8 +5,8 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/core-kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted, useRequestParam } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -18,7 +18,7 @@ export async function updateRegistryRouteHandler(req: Request, res: Response) :
     const id = useRequestParam(req, 'id');
 
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.REGISTRY_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_MANAGE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-core/src/http/controllers/special/service/handlers/registry/command.ts b/packages/server-core/src/http/controllers/special/service/handlers/registry/command.ts
index e22977a66..2cb5d09d1 100644
--- a/packages/server-core/src/http/controllers/special/service/handlers/registry/command.ts
+++ b/packages/server-core/src/http/controllers/special/service/handlers/registry/command.ts
@@ -6,11 +6,12 @@
  */
 
 import {
-    PermissionID, RegistryAPICommand,
+    RegistryAPICommand,
 } from '@privateaim/core-kit';
 import {
     ForbiddenError,
 } from '@ebec/http';
+import { PermissionName } from '@privateaim/kit';
 import type { Request, Response } from 'routup';
 import { sendAccepted } from 'routup';
 import { useDataSource } from 'typeorm-extension';
@@ -30,7 +31,7 @@ import { runServiceRegistryValidation } from '../../utils/validation';
 export async function handleRegistryCommandRouteHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
 
-    if (!ability.has(PermissionID.REGISTRY_MANAGE)) {
+    if (!ability.has(PermissionName.REGISTRY_MANAGE)) {
         throw new ForbiddenError('You are not permitted to manage the registry.');
     }
 
diff --git a/packages/server-http-kit/src/services/authup/utils.ts b/packages/server-http-kit/src/services/authup/utils.ts
index d5ebe9644..706629301 100644
--- a/packages/server-http-kit/src/services/authup/utils.ts
+++ b/packages/server-http-kit/src/services/authup/utils.ts
@@ -7,9 +7,9 @@
 
 import type { Ability } from '@authup/kit';
 import { Abilities } from '@authup/kit';
-import { REALM_MASTER_NAME } from '@authup/core-kit';
+import { PermissionName as AuthupPermissionName, REALM_MASTER_NAME } from '@authup/core-kit';
 import type { TokenVerificationData } from '@authup/server-core-plugin-kit';
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Request } from 'routup';
 import { setRequestEnv } from '../../request';
 
@@ -24,7 +24,10 @@ TokenVerificationData,
 >;
 
 function generateAbilities(): Ability[] {
-    return Object.values(PermissionID).map((name) => ({
+    return Object.values({
+        ...PermissionName,
+        ...AuthupPermissionName,
+    }).map((name) => ({
         name,
     } satisfies Ability));
 }
diff --git a/packages/server-realtime-kit/src/services/authup/utils.ts b/packages/server-realtime-kit/src/services/authup/utils.ts
index bde423df3..853e72afc 100644
--- a/packages/server-realtime-kit/src/services/authup/utils.ts
+++ b/packages/server-realtime-kit/src/services/authup/utils.ts
@@ -5,11 +5,11 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+import { PermissionName as AuthupPermissionName, REALM_MASTER_NAME } from '@authup/core-kit';
 import type { Ability } from '@authup/kit';
 import { Abilities, OAuth2SubKind } from '@authup/kit';
-import { REALM_MASTER_NAME } from '@authup/core-kit';
 import type { TokenVerificationData } from '@authup/server-core-plugin-kit';
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import type { Socket } from '../../types';
 
 type TokenVerificationDataMinimal = Pick<
@@ -23,7 +23,10 @@ TokenVerificationData,
 >;
 
 function generateAbilities(): Ability[] {
-    return Object.values(PermissionID).map((name) => ({
+    return Object.values({
+        ...PermissionName,
+        ...AuthupPermissionName,
+    }).map((name) => ({
         name,
     } satisfies Ability));
 }
diff --git a/packages/server-storage/src/http/controllers/bucket-file/handlers/delete.ts b/packages/server-storage/src/http/controllers/bucket-file/handlers/delete.ts
index 8cf64d53f..642dfe1a6 100644
--- a/packages/server-storage/src/http/controllers/bucket-file/handlers/delete.ts
+++ b/packages/server-storage/src/http/controllers/bucket-file/handlers/delete.ts
@@ -5,7 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
@@ -42,7 +42,7 @@ export async function executeBucketFileRouteDeleteHandler(req: Request, res: Res
         !isBucketFileOwnedByActor(entity, actor)
     ) {
         const ability = useRequestEnv(req, 'abilities');
-        if (!ability.has(PermissionID.BUCKET_EDIT)) {
+        if (!ability.has(PermissionName.BUCKET_UPDATE)) {
             throw new ForbiddenError();
         }
 
diff --git a/packages/server-storage/src/http/controllers/bucket/handlers/create.ts b/packages/server-storage/src/http/controllers/bucket/handlers/create.ts
index 70a657d1f..701e2d37a 100644
--- a/packages/server-storage/src/http/controllers/bucket/handlers/create.ts
+++ b/packages/server-storage/src/http/controllers/bucket/handlers/create.ts
@@ -5,7 +5,7 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import { ForbiddenError } from '@ebec/http';
 import type { Request, Response } from 'routup';
 import { sendCreated } from 'routup';
@@ -17,7 +17,7 @@ import { runBucketValidation } from '../utils/validation';
 
 export async function executeBucketRouteCreateHandler(req: Request, res: Response) : Promise<any> {
     const ability = useRequestEnv(req, 'abilities');
-    if (!ability.has(PermissionID.BUCKET_ADD)) {
+    if (!ability.has(PermissionName.BUCKET_CREATE)) {
         throw new ForbiddenError();
     }
 
diff --git a/packages/server-storage/src/http/controllers/bucket/handlers/delete.ts b/packages/server-storage/src/http/controllers/bucket/handlers/delete.ts
index da1ee3aa3..e2c78e16a 100644
--- a/packages/server-storage/src/http/controllers/bucket/handlers/delete.ts
+++ b/packages/server-storage/src/http/controllers/bucket/handlers/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { isUUID } from '@authup/kit';
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
@@ -38,7 +38,7 @@ export async function executeBucketRouteDeleteHandler(req: Request, res: Respons
     const actor = getActorFromRequest(req);
     if (!isBucketOwnedByActor(entity, actor)) {
         const ability = useRequestEnv(req, 'abilities');
-        if (!ability.has(PermissionID.BUCKET_DROP)) {
+        if (!ability.has(PermissionName.BUCKET_DELETE)) {
             throw new ForbiddenError();
         }
 
diff --git a/packages/server-storage/src/http/controllers/bucket/handlers/update.ts b/packages/server-storage/src/http/controllers/bucket/handlers/update.ts
index 6fc10ca10..fc7748ac7 100644
--- a/packages/server-storage/src/http/controllers/bucket/handlers/update.ts
+++ b/packages/server-storage/src/http/controllers/bucket/handlers/update.ts
@@ -6,7 +6,7 @@
  */
 
 import { isUUID } from '@authup/kit';
-import { PermissionID } from '@privateaim/kit';
+import { PermissionName } from '@privateaim/kit';
 import { ForbiddenError, NotFoundError } from '@ebec/http';
 import { isRealmResourceWritable } from '@authup/core-kit';
 import type { Request, Response } from 'routup';
@@ -43,7 +43,7 @@ export async function executeBucketRouteUpdateHandler(req: Request, res: Respons
     const actor = getActorFromRequest(req);
     if (!isBucketOwnedByActor(entity, actor)) {
         const ability = useRequestEnv(req, 'abilities');
-        if (!ability.has(PermissionID.BUCKET_EDIT)) {
+        if (!ability.has(PermissionName.BUCKET_UPDATE)) {
             throw new ForbiddenError();
         }