diff --git a/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java b/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java
index 2d3244e8..67d605fb 100644
--- a/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java
+++ b/src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java
@@ -5,11 +5,13 @@ import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef;
 import org.apache.commons.lang3.StringUtils;
 
 import java.nio.file.*;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.joining;
 import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.*;
 
@@ -36,6 +38,7 @@ public class RbacViewMermaidFlowchartGenerator {
                                 g.getSubRoleDef() != null ? g.getSubRoleDef().getEntityAlias() : null,
                                 g.getPermDef() != null ? g.getPermDef().getEntityAlias() : null))
                         .filter(Objects::nonNull)
+                        .sorted(comparing(RbacView.EntityAlias::aliasName))
                         .distinct()
                         .filter(rbacDef::renderInDiagram)
                         .collect(Collectors.toList());
diff --git a/src/main/resources/db/changelog/2-test/203-test-domain/2033-test-domain-rbac.md b/src/main/resources/db/changelog/2-test/203-test-domain/2033-test-domain-rbac.md
index d9b3748c..72693972 100644
--- a/src/main/resources/db/changelog/2-test/203-test-domain/2033-test-domain-rbac.md
+++ b/src/main/resources/db/changelog/2-test/203-test-domain/2033-test-domain-rbac.md
@@ -6,32 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph package.customer["`**package.customer**`"]
-    direction TB
-    style package.customer fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph package.customer:roles[ ]
-        style package.customer:roles fill:#99bcdb,stroke:white
-
-        role:package.customer:OWNER[[package.customer:OWNER]]
-        role:package.customer:ADMIN[[package.customer:ADMIN]]
-        role:package.customer:TENANT[[package.customer:TENANT]]
-    end
-end
-
-subgraph package["`**package**`"]
-    direction TB
-    style package fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph package:roles[ ]
-        style package:roles fill:#99bcdb,stroke:white
-
-        role:package:OWNER[[package:OWNER]]
-        role:package:ADMIN[[package:ADMIN]]
-        role:package:TENANT[[package:TENANT]]
-    end
-end
-
 subgraph domain["`**domain**`"]
     direction TB
     style domain fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -53,6 +27,32 @@ subgraph domain["`**domain**`"]
     end
 end
 
+subgraph package["`**package**`"]
+    direction TB
+    style package fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph package:roles[ ]
+        style package:roles fill:#99bcdb,stroke:white
+
+        role:package:OWNER[[package:OWNER]]
+        role:package:ADMIN[[package:ADMIN]]
+        role:package:TENANT[[package:TENANT]]
+    end
+end
+
+subgraph package.customer["`**package.customer**`"]
+    direction TB
+    style package.customer fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph package.customer:roles[ ]
+        style package.customer:roles fill:#99bcdb,stroke:white
+
+        role:package.customer:OWNER[[package.customer:OWNER]]
+        role:package.customer:ADMIN[[package.customer:ADMIN]]
+        role:package.customer:TENANT[[package.customer:TENANT]]
+    end
+end
+
 %% granting roles to roles
 role:global:ADMIN -.->|XX| role:package.customer:OWNER
 role:package.customer:OWNER -.-> role:package.customer:ADMIN
diff --git a/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac-REPRESENTATIVE.md b/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac-REPRESENTATIVE.md
index ca5005fe..0d944401 100644
--- a/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac-REPRESENTATIVE.md
+++ b/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac-REPRESENTATIVE.md
@@ -19,19 +19,6 @@ subgraph anchorPerson["`**anchorPerson**`"]
     end
 end
 
-subgraph holderPerson["`**holderPerson**`"]
-    direction TB
-    style holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph holderPerson:roles[ ]
-        style holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:holderPerson:OWNER[[holderPerson:OWNER]]
-        role:holderPerson:ADMIN[[holderPerson:ADMIN]]
-        role:holderPerson:REFERRER[[holderPerson:REFERRER]]
-    end
-end
-
 subgraph contact["`**contact**`"]
     direction TB
     style contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -45,6 +32,19 @@ subgraph contact["`**contact**`"]
     end
 end
 
+subgraph holderPerson["`**holderPerson**`"]
+    direction TB
+    style holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph holderPerson:roles[ ]
+        style holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:holderPerson:OWNER[[holderPerson:OWNER]]
+        role:holderPerson:ADMIN[[holderPerson:ADMIN]]
+        role:holderPerson:REFERRER[[holderPerson:REFERRER]]
+    end
+end
+
 subgraph relation["`**relation**`"]
     direction TB
     style relation fill:#dd4901,stroke:#274d6e,stroke-width:8px
diff --git a/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac.md b/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac.md
index f10cb85c..47d4d220 100644
--- a/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/503-relation/5033-hs-office-relation-rbac.md
@@ -19,19 +19,6 @@ subgraph anchorPerson["`**anchorPerson**`"]
     end
 end
 
-subgraph holderPerson["`**holderPerson**`"]
-    direction TB
-    style holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph holderPerson:roles[ ]
-        style holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:holderPerson:OWNER[[holderPerson:OWNER]]
-        role:holderPerson:ADMIN[[holderPerson:ADMIN]]
-        role:holderPerson:REFERRER[[holderPerson:REFERRER]]
-    end
-end
-
 subgraph contact["`**contact**`"]
     direction TB
     style contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -45,6 +32,19 @@ subgraph contact["`**contact**`"]
     end
 end
 
+subgraph holderPerson["`**holderPerson**`"]
+    direction TB
+    style holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph holderPerson:roles[ ]
+        style holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:holderPerson:OWNER[[holderPerson:OWNER]]
+        role:holderPerson:ADMIN[[holderPerson:ADMIN]]
+        role:holderPerson:REFERRER[[holderPerson:REFERRER]]
+    end
+end
+
 subgraph relation["`**relation**`"]
     direction TB
     style relation fill:#dd4901,stroke:#274d6e,stroke-width:8px
diff --git a/src/main/resources/db/changelog/5-hs-office/504-partner/5043-hs-office-partner-rbac.md b/src/main/resources/db/changelog/5-hs-office/504-partner/5043-hs-office-partner-rbac.md
index f5058678..ecbe29de 100644
--- a/src/main/resources/db/changelog/5-hs-office/504-partner/5043-hs-office-partner-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/504-partner/5043-hs-office-partner-rbac.md
@@ -34,6 +34,19 @@ subgraph partner["`**partner**`"]
     end
 end
 
+subgraph partnerDetails["`**partnerDetails**`"]
+    direction TB
+    style partnerDetails fill:#feb28c,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerDetails:permissions[ ]
+        style partnerDetails:permissions fill:#feb28c,stroke:white
+
+        perm:partnerDetails:DELETE{{partnerDetails:DELETE}}
+        perm:partnerDetails:UPDATE{{partnerDetails:UPDATE}}
+        perm:partnerDetails:SELECT{{partnerDetails:SELECT}}
+    end
+end
+
 subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
     direction TB
     style partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -47,19 +60,6 @@ subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
     end
 end
 
-subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
-    direction TB
-    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.holderPerson:roles[ ]
-        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
-        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
-        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
-    end
-end
-
 subgraph partnerRel.contact["`**partnerRel.contact**`"]
     direction TB
     style partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -73,16 +73,16 @@ subgraph partnerRel.contact["`**partnerRel.contact**`"]
     end
 end
 
-subgraph partnerDetails["`**partnerDetails**`"]
+subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
     direction TB
-    style partnerDetails fill:#feb28c,stroke:#274d6e,stroke-width:8px
+    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph partnerDetails:permissions[ ]
-        style partnerDetails:permissions fill:#feb28c,stroke:white
+    subgraph partnerRel.holderPerson:roles[ ]
+        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
 
-        perm:partnerDetails:DELETE{{partnerDetails:DELETE}}
-        perm:partnerDetails:UPDATE{{partnerDetails:UPDATE}}
-        perm:partnerDetails:SELECT{{partnerDetails:SELECT}}
+        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
+        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
+        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
     end
 end
 
diff --git a/src/main/resources/db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.md b/src/main/resources/db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.md
index 2635e86a..ef8bc404 100644
--- a/src/main/resources/db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/506-debitor/5063-hs-office-debitor-rbac.md
@@ -47,19 +47,6 @@ subgraph debitorRel.anchorPerson["`**debitorRel.anchorPerson**`"]
     end
 end
 
-subgraph debitorRel.holderPerson["`**debitorRel.holderPerson**`"]
-    direction TB
-    style debitorRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph debitorRel.holderPerson:roles[ ]
-        style debitorRel.holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:debitorRel.holderPerson:OWNER[[debitorRel.holderPerson:OWNER]]
-        role:debitorRel.holderPerson:ADMIN[[debitorRel.holderPerson:ADMIN]]
-        role:debitorRel.holderPerson:REFERRER[[debitorRel.holderPerson:REFERRER]]
-    end
-end
-
 subgraph debitorRel.contact["`**debitorRel.contact**`"]
     direction TB
     style debitorRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -73,55 +60,16 @@ subgraph debitorRel.contact["`**debitorRel.contact**`"]
     end
 end
 
-subgraph refundBankAccount["`**refundBankAccount**`"]
+subgraph debitorRel.holderPerson["`**debitorRel.holderPerson**`"]
     direction TB
-    style refundBankAccount fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style debitorRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph refundBankAccount:roles[ ]
-        style refundBankAccount:roles fill:#99bcdb,stroke:white
+    subgraph debitorRel.holderPerson:roles[ ]
+        style debitorRel.holderPerson:roles fill:#99bcdb,stroke:white
 
-        role:refundBankAccount:OWNER[[refundBankAccount:OWNER]]
-        role:refundBankAccount:ADMIN[[refundBankAccount:ADMIN]]
-        role:refundBankAccount:REFERRER[[refundBankAccount:REFERRER]]
-    end
-end
-
-subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
-    direction TB
-    style partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.anchorPerson:roles[ ]
-        style partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.anchorPerson:OWNER[[partnerRel.anchorPerson:OWNER]]
-        role:partnerRel.anchorPerson:ADMIN[[partnerRel.anchorPerson:ADMIN]]
-        role:partnerRel.anchorPerson:REFERRER[[partnerRel.anchorPerson:REFERRER]]
-    end
-end
-
-subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
-    direction TB
-    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.holderPerson:roles[ ]
-        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
-        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
-        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
-    end
-end
-
-subgraph partnerRel.contact["`**partnerRel.contact**`"]
-    direction TB
-    style partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.contact:roles[ ]
-        style partnerRel.contact:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.contact:OWNER[[partnerRel.contact:OWNER]]
-        role:partnerRel.contact:ADMIN[[partnerRel.contact:ADMIN]]
-        role:partnerRel.contact:REFERRER[[partnerRel.contact:REFERRER]]
+        role:debitorRel.holderPerson:OWNER[[debitorRel.holderPerson:OWNER]]
+        role:debitorRel.holderPerson:ADMIN[[debitorRel.holderPerson:ADMIN]]
+        role:debitorRel.holderPerson:REFERRER[[debitorRel.holderPerson:REFERRER]]
     end
 end
 
@@ -139,6 +87,58 @@ subgraph partnerRel["`**partnerRel**`"]
     end
 end
 
+subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
+    direction TB
+    style partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.anchorPerson:roles[ ]
+        style partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.anchorPerson:OWNER[[partnerRel.anchorPerson:OWNER]]
+        role:partnerRel.anchorPerson:ADMIN[[partnerRel.anchorPerson:ADMIN]]
+        role:partnerRel.anchorPerson:REFERRER[[partnerRel.anchorPerson:REFERRER]]
+    end
+end
+
+subgraph partnerRel.contact["`**partnerRel.contact**`"]
+    direction TB
+    style partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.contact:roles[ ]
+        style partnerRel.contact:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.contact:OWNER[[partnerRel.contact:OWNER]]
+        role:partnerRel.contact:ADMIN[[partnerRel.contact:ADMIN]]
+        role:partnerRel.contact:REFERRER[[partnerRel.contact:REFERRER]]
+    end
+end
+
+subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
+    direction TB
+    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.holderPerson:roles[ ]
+        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
+        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
+        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
+    end
+end
+
+subgraph refundBankAccount["`**refundBankAccount**`"]
+    direction TB
+    style refundBankAccount fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph refundBankAccount:roles[ ]
+        style refundBankAccount:roles fill:#99bcdb,stroke:white
+
+        role:refundBankAccount:OWNER[[refundBankAccount:OWNER]]
+        role:refundBankAccount:ADMIN[[refundBankAccount:ADMIN]]
+        role:refundBankAccount:REFERRER[[refundBankAccount:REFERRER]]
+    end
+end
+
 %% granting roles to roles
 role:global:ADMIN -.-> role:debitorRel.anchorPerson:OWNER
 role:debitorRel.anchorPerson:OWNER -.-> role:debitorRel.anchorPerson:ADMIN
@@ -149,6 +149,16 @@ role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel.holderPerson:REFERRER
 role:global:ADMIN -.-> role:debitorRel.contact:OWNER
 role:debitorRel.contact:OWNER -.-> role:debitorRel.contact:ADMIN
 role:debitorRel.contact:ADMIN -.-> role:debitorRel.contact:REFERRER
+role:global:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel:OWNER -.-> role:debitorRel:ADMIN
+role:debitorRel:ADMIN -.-> role:debitorRel:AGENT
+role:debitorRel:AGENT -.-> role:debitorRel:TENANT
+role:debitorRel.contact:ADMIN -.-> role:debitorRel:TENANT
+role:debitorRel:TENANT -.-> role:debitorRel.anchorPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.holderPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.contact:REFERRER
+role:debitorRel.anchorPerson:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel:AGENT
 role:global:ADMIN -.-> role:refundBankAccount:OWNER
 role:refundBankAccount:OWNER -.-> role:refundBankAccount:ADMIN
 role:refundBankAccount:ADMIN -.-> role:refundBankAccount:REFERRER
diff --git a/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5073-hs-office-sepamandate-rbac.md b/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5073-hs-office-sepamandate-rbac.md
index 3b8e8cb8..d6b47c0e 100644
--- a/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5073-hs-office-sepamandate-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/507-sepamandate/5073-hs-office-sepamandate-rbac.md
@@ -6,6 +6,33 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
+subgraph bankAccount["`**bankAccount**`"]
+    direction TB
+    style bankAccount fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bankAccount:roles[ ]
+        style bankAccount:roles fill:#99bcdb,stroke:white
+
+        role:bankAccount:OWNER[[bankAccount:OWNER]]
+        role:bankAccount:ADMIN[[bankAccount:ADMIN]]
+        role:bankAccount:REFERRER[[bankAccount:REFERRER]]
+    end
+end
+
+subgraph debitorRel["`**debitorRel**`"]
+    direction TB
+    style debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph debitorRel:roles[ ]
+        style debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:debitorRel:OWNER[[debitorRel:OWNER]]
+        role:debitorRel:ADMIN[[debitorRel:ADMIN]]
+        role:debitorRel:AGENT[[debitorRel:AGENT]]
+        role:debitorRel:TENANT[[debitorRel:TENANT]]
+    end
+end
+
 subgraph debitorRel.anchorPerson["`**debitorRel.anchorPerson**`"]
     direction TB
     style debitorRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -19,19 +46,6 @@ subgraph debitorRel.anchorPerson["`**debitorRel.anchorPerson**`"]
     end
 end
 
-subgraph debitorRel.holderPerson["`**debitorRel.holderPerson**`"]
-    direction TB
-    style debitorRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph debitorRel.holderPerson:roles[ ]
-        style debitorRel.holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:debitorRel.holderPerson:OWNER[[debitorRel.holderPerson:OWNER]]
-        role:debitorRel.holderPerson:ADMIN[[debitorRel.holderPerson:ADMIN]]
-        role:debitorRel.holderPerson:REFERRER[[debitorRel.holderPerson:REFERRER]]
-    end
-end
-
 subgraph debitorRel.contact["`**debitorRel.contact**`"]
     direction TB
     style debitorRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
@@ -45,16 +59,16 @@ subgraph debitorRel.contact["`**debitorRel.contact**`"]
     end
 end
 
-subgraph bankAccount["`**bankAccount**`"]
+subgraph debitorRel.holderPerson["`**debitorRel.holderPerson**`"]
     direction TB
-    style bankAccount fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style debitorRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph bankAccount:roles[ ]
-        style bankAccount:roles fill:#99bcdb,stroke:white
+    subgraph debitorRel.holderPerson:roles[ ]
+        style debitorRel.holderPerson:roles fill:#99bcdb,stroke:white
 
-        role:bankAccount:OWNER[[bankAccount:OWNER]]
-        role:bankAccount:ADMIN[[bankAccount:ADMIN]]
-        role:bankAccount:REFERRER[[bankAccount:REFERRER]]
+        role:debitorRel.holderPerson:OWNER[[debitorRel.holderPerson:OWNER]]
+        role:debitorRel.holderPerson:ADMIN[[debitorRel.holderPerson:ADMIN]]
+        role:debitorRel.holderPerson:REFERRER[[debitorRel.holderPerson:REFERRER]]
     end
 end
 
@@ -81,20 +95,6 @@ subgraph sepaMandate["`**sepaMandate**`"]
     end
 end
 
-subgraph debitorRel["`**debitorRel**`"]
-    direction TB
-    style debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph debitorRel:roles[ ]
-        style debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:debitorRel:OWNER[[debitorRel:OWNER]]
-        role:debitorRel:ADMIN[[debitorRel:ADMIN]]
-        role:debitorRel:AGENT[[debitorRel:AGENT]]
-        role:debitorRel:TENANT[[debitorRel:TENANT]]
-    end
-end
-
 %% granting roles to users
 user:creator ==> role:sepaMandate:OWNER
 
@@ -108,6 +108,16 @@ role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel.holderPerson:REFERRER
 role:global:ADMIN -.-> role:debitorRel.contact:OWNER
 role:debitorRel.contact:OWNER -.-> role:debitorRel.contact:ADMIN
 role:debitorRel.contact:ADMIN -.-> role:debitorRel.contact:REFERRER
+role:global:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel:OWNER -.-> role:debitorRel:ADMIN
+role:debitorRel:ADMIN -.-> role:debitorRel:AGENT
+role:debitorRel:AGENT -.-> role:debitorRel:TENANT
+role:debitorRel.contact:ADMIN -.-> role:debitorRel:TENANT
+role:debitorRel:TENANT -.-> role:debitorRel.anchorPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.holderPerson:REFERRER
+role:debitorRel:TENANT -.-> role:debitorRel.contact:REFERRER
+role:debitorRel.anchorPerson:ADMIN -.-> role:debitorRel:OWNER
+role:debitorRel.holderPerson:ADMIN -.-> role:debitorRel:AGENT
 role:global:ADMIN -.-> role:bankAccount:OWNER
 role:bankAccount:OWNER -.-> role:bankAccount:ADMIN
 role:bankAccount:ADMIN -.-> role:bankAccount:REFERRER
diff --git a/src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.md b/src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.md
index 1c9a205f..083e244e 100644
--- a/src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.md
@@ -6,59 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
-    direction TB
-    style partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.anchorPerson:roles[ ]
-        style partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.anchorPerson:OWNER[[partnerRel.anchorPerson:OWNER]]
-        role:partnerRel.anchorPerson:ADMIN[[partnerRel.anchorPerson:ADMIN]]
-        role:partnerRel.anchorPerson:REFERRER[[partnerRel.anchorPerson:REFERRER]]
-    end
-end
-
-subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
-    direction TB
-    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.holderPerson:roles[ ]
-        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
-        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
-        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
-    end
-end
-
-subgraph partnerRel.contact["`**partnerRel.contact**`"]
-    direction TB
-    style partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel.contact:roles[ ]
-        style partnerRel.contact:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel.contact:OWNER[[partnerRel.contact:OWNER]]
-        role:partnerRel.contact:ADMIN[[partnerRel.contact:ADMIN]]
-        role:partnerRel.contact:REFERRER[[partnerRel.contact:REFERRER]]
-    end
-end
-
-subgraph partnerRel["`**partnerRel**`"]
-    direction TB
-    style partnerRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph partnerRel:roles[ ]
-        style partnerRel:roles fill:#99bcdb,stroke:white
-
-        role:partnerRel:OWNER[[partnerRel:OWNER]]
-        role:partnerRel:ADMIN[[partnerRel:ADMIN]]
-        role:partnerRel:AGENT[[partnerRel:AGENT]]
-        role:partnerRel:TENANT[[partnerRel:TENANT]]
-    end
-end
-
 subgraph membership["`**membership**`"]
     direction TB
     style membership fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -81,6 +28,59 @@ subgraph membership["`**membership**`"]
     end
 end
 
+subgraph partnerRel["`**partnerRel**`"]
+    direction TB
+    style partnerRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel:roles[ ]
+        style partnerRel:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel:OWNER[[partnerRel:OWNER]]
+        role:partnerRel:ADMIN[[partnerRel:ADMIN]]
+        role:partnerRel:AGENT[[partnerRel:AGENT]]
+        role:partnerRel:TENANT[[partnerRel:TENANT]]
+    end
+end
+
+subgraph partnerRel.anchorPerson["`**partnerRel.anchorPerson**`"]
+    direction TB
+    style partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.anchorPerson:roles[ ]
+        style partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.anchorPerson:OWNER[[partnerRel.anchorPerson:OWNER]]
+        role:partnerRel.anchorPerson:ADMIN[[partnerRel.anchorPerson:ADMIN]]
+        role:partnerRel.anchorPerson:REFERRER[[partnerRel.anchorPerson:REFERRER]]
+    end
+end
+
+subgraph partnerRel.contact["`**partnerRel.contact**`"]
+    direction TB
+    style partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.contact:roles[ ]
+        style partnerRel.contact:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.contact:OWNER[[partnerRel.contact:OWNER]]
+        role:partnerRel.contact:ADMIN[[partnerRel.contact:ADMIN]]
+        role:partnerRel.contact:REFERRER[[partnerRel.contact:REFERRER]]
+    end
+end
+
+subgraph partnerRel.holderPerson["`**partnerRel.holderPerson**`"]
+    direction TB
+    style partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph partnerRel.holderPerson:roles[ ]
+        style partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:partnerRel.holderPerson:OWNER[[partnerRel.holderPerson:OWNER]]
+        role:partnerRel.holderPerson:ADMIN[[partnerRel.holderPerson:ADMIN]]
+        role:partnerRel.holderPerson:REFERRER[[partnerRel.holderPerson:REFERRER]]
+    end
+end
+
 %% granting roles to users
 user:creator ==> role:membership:OWNER
 
diff --git a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.md b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.md
index 955478a2..23103840 100644
--- a/src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.md
@@ -6,42 +6,29 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph membership.partnerRel.anchorPerson["`**membership.partnerRel.anchorPerson**`"]
+subgraph coopSharesTransaction["`**coopSharesTransaction**`"]
     direction TB
-    style membership.partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style coopSharesTransaction fill:#dd4901,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership.partnerRel.anchorPerson:roles[ ]
-        style membership.partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
+    subgraph coopSharesTransaction:permissions[ ]
+        style coopSharesTransaction:permissions fill:#dd4901,stroke:white
 
-        role:membership.partnerRel.anchorPerson:OWNER[[membership.partnerRel.anchorPerson:OWNER]]
-        role:membership.partnerRel.anchorPerson:ADMIN[[membership.partnerRel.anchorPerson:ADMIN]]
-        role:membership.partnerRel.anchorPerson:REFERRER[[membership.partnerRel.anchorPerson:REFERRER]]
+        perm:coopSharesTransaction:INSERT{{coopSharesTransaction:INSERT}}
+        perm:coopSharesTransaction:UPDATE{{coopSharesTransaction:UPDATE}}
+        perm:coopSharesTransaction:SELECT{{coopSharesTransaction:SELECT}}
     end
 end
 
-subgraph membership.partnerRel.holderPerson["`**membership.partnerRel.holderPerson**`"]
+subgraph membership["`**membership**`"]
     direction TB
-    style membership.partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style membership fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership.partnerRel.holderPerson:roles[ ]
-        style membership.partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+    subgraph membership:roles[ ]
+        style membership:roles fill:#99bcdb,stroke:white
 
-        role:membership.partnerRel.holderPerson:OWNER[[membership.partnerRel.holderPerson:OWNER]]
-        role:membership.partnerRel.holderPerson:ADMIN[[membership.partnerRel.holderPerson:ADMIN]]
-        role:membership.partnerRel.holderPerson:REFERRER[[membership.partnerRel.holderPerson:REFERRER]]
-    end
-end
-
-subgraph membership.partnerRel.contact["`**membership.partnerRel.contact**`"]
-    direction TB
-    style membership.partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph membership.partnerRel.contact:roles[ ]
-        style membership.partnerRel.contact:roles fill:#99bcdb,stroke:white
-
-        role:membership.partnerRel.contact:OWNER[[membership.partnerRel.contact:OWNER]]
-        role:membership.partnerRel.contact:ADMIN[[membership.partnerRel.contact:ADMIN]]
-        role:membership.partnerRel.contact:REFERRER[[membership.partnerRel.contact:REFERRER]]
+        role:membership:OWNER[[membership:OWNER]]
+        role:membership:ADMIN[[membership:ADMIN]]
+        role:membership:AGENT[[membership:AGENT]]
     end
 end
 
@@ -59,29 +46,42 @@ subgraph membership.partnerRel["`**membership.partnerRel**`"]
     end
 end
 
-subgraph membership["`**membership**`"]
+subgraph membership.partnerRel.anchorPerson["`**membership.partnerRel.anchorPerson**`"]
     direction TB
-    style membership fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style membership.partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership:roles[ ]
-        style membership:roles fill:#99bcdb,stroke:white
+    subgraph membership.partnerRel.anchorPerson:roles[ ]
+        style membership.partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
 
-        role:membership:OWNER[[membership:OWNER]]
-        role:membership:ADMIN[[membership:ADMIN]]
-        role:membership:AGENT[[membership:AGENT]]
+        role:membership.partnerRel.anchorPerson:OWNER[[membership.partnerRel.anchorPerson:OWNER]]
+        role:membership.partnerRel.anchorPerson:ADMIN[[membership.partnerRel.anchorPerson:ADMIN]]
+        role:membership.partnerRel.anchorPerson:REFERRER[[membership.partnerRel.anchorPerson:REFERRER]]
     end
 end
 
-subgraph coopSharesTransaction["`**coopSharesTransaction**`"]
+subgraph membership.partnerRel.contact["`**membership.partnerRel.contact**`"]
     direction TB
-    style coopSharesTransaction fill:#dd4901,stroke:#274d6e,stroke-width:8px
+    style membership.partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph coopSharesTransaction:permissions[ ]
-        style coopSharesTransaction:permissions fill:#dd4901,stroke:white
+    subgraph membership.partnerRel.contact:roles[ ]
+        style membership.partnerRel.contact:roles fill:#99bcdb,stroke:white
 
-        perm:coopSharesTransaction:INSERT{{coopSharesTransaction:INSERT}}
-        perm:coopSharesTransaction:UPDATE{{coopSharesTransaction:UPDATE}}
-        perm:coopSharesTransaction:SELECT{{coopSharesTransaction:SELECT}}
+        role:membership.partnerRel.contact:OWNER[[membership.partnerRel.contact:OWNER]]
+        role:membership.partnerRel.contact:ADMIN[[membership.partnerRel.contact:ADMIN]]
+        role:membership.partnerRel.contact:REFERRER[[membership.partnerRel.contact:REFERRER]]
+    end
+end
+
+subgraph membership.partnerRel.holderPerson["`**membership.partnerRel.holderPerson**`"]
+    direction TB
+    style membership.partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph membership.partnerRel.holderPerson:roles[ ]
+        style membership.partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:membership.partnerRel.holderPerson:OWNER[[membership.partnerRel.holderPerson:OWNER]]
+        role:membership.partnerRel.holderPerson:ADMIN[[membership.partnerRel.holderPerson:ADMIN]]
+        role:membership.partnerRel.holderPerson:REFERRER[[membership.partnerRel.holderPerson:REFERRER]]
     end
 end
 
diff --git a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.md b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.md
index bd3da694..de30185b 100644
--- a/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.md
+++ b/src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.md
@@ -6,42 +6,29 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph membership.partnerRel.anchorPerson["`**membership.partnerRel.anchorPerson**`"]
+subgraph coopAssetsTransaction["`**coopAssetsTransaction**`"]
     direction TB
-    style membership.partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style coopAssetsTransaction fill:#dd4901,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership.partnerRel.anchorPerson:roles[ ]
-        style membership.partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
+    subgraph coopAssetsTransaction:permissions[ ]
+        style coopAssetsTransaction:permissions fill:#dd4901,stroke:white
 
-        role:membership.partnerRel.anchorPerson:OWNER[[membership.partnerRel.anchorPerson:OWNER]]
-        role:membership.partnerRel.anchorPerson:ADMIN[[membership.partnerRel.anchorPerson:ADMIN]]
-        role:membership.partnerRel.anchorPerson:REFERRER[[membership.partnerRel.anchorPerson:REFERRER]]
+        perm:coopAssetsTransaction:INSERT{{coopAssetsTransaction:INSERT}}
+        perm:coopAssetsTransaction:UPDATE{{coopAssetsTransaction:UPDATE}}
+        perm:coopAssetsTransaction:SELECT{{coopAssetsTransaction:SELECT}}
     end
 end
 
-subgraph membership.partnerRel.holderPerson["`**membership.partnerRel.holderPerson**`"]
+subgraph membership["`**membership**`"]
     direction TB
-    style membership.partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style membership fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership.partnerRel.holderPerson:roles[ ]
-        style membership.partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+    subgraph membership:roles[ ]
+        style membership:roles fill:#99bcdb,stroke:white
 
-        role:membership.partnerRel.holderPerson:OWNER[[membership.partnerRel.holderPerson:OWNER]]
-        role:membership.partnerRel.holderPerson:ADMIN[[membership.partnerRel.holderPerson:ADMIN]]
-        role:membership.partnerRel.holderPerson:REFERRER[[membership.partnerRel.holderPerson:REFERRER]]
-    end
-end
-
-subgraph membership.partnerRel.contact["`**membership.partnerRel.contact**`"]
-    direction TB
-    style membership.partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph membership.partnerRel.contact:roles[ ]
-        style membership.partnerRel.contact:roles fill:#99bcdb,stroke:white
-
-        role:membership.partnerRel.contact:OWNER[[membership.partnerRel.contact:OWNER]]
-        role:membership.partnerRel.contact:ADMIN[[membership.partnerRel.contact:ADMIN]]
-        role:membership.partnerRel.contact:REFERRER[[membership.partnerRel.contact:REFERRER]]
+        role:membership:OWNER[[membership:OWNER]]
+        role:membership:ADMIN[[membership:ADMIN]]
+        role:membership:AGENT[[membership:AGENT]]
     end
 end
 
@@ -59,29 +46,42 @@ subgraph membership.partnerRel["`**membership.partnerRel**`"]
     end
 end
 
-subgraph membership["`**membership**`"]
+subgraph membership.partnerRel.anchorPerson["`**membership.partnerRel.anchorPerson**`"]
     direction TB
-    style membership fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+    style membership.partnerRel.anchorPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph membership:roles[ ]
-        style membership:roles fill:#99bcdb,stroke:white
+    subgraph membership.partnerRel.anchorPerson:roles[ ]
+        style membership.partnerRel.anchorPerson:roles fill:#99bcdb,stroke:white
 
-        role:membership:OWNER[[membership:OWNER]]
-        role:membership:ADMIN[[membership:ADMIN]]
-        role:membership:AGENT[[membership:AGENT]]
+        role:membership.partnerRel.anchorPerson:OWNER[[membership.partnerRel.anchorPerson:OWNER]]
+        role:membership.partnerRel.anchorPerson:ADMIN[[membership.partnerRel.anchorPerson:ADMIN]]
+        role:membership.partnerRel.anchorPerson:REFERRER[[membership.partnerRel.anchorPerson:REFERRER]]
     end
 end
 
-subgraph coopAssetsTransaction["`**coopAssetsTransaction**`"]
+subgraph membership.partnerRel.contact["`**membership.partnerRel.contact**`"]
     direction TB
-    style coopAssetsTransaction fill:#dd4901,stroke:#274d6e,stroke-width:8px
+    style membership.partnerRel.contact fill:#99bcdb,stroke:#274d6e,stroke-width:8px
 
-    subgraph coopAssetsTransaction:permissions[ ]
-        style coopAssetsTransaction:permissions fill:#dd4901,stroke:white
+    subgraph membership.partnerRel.contact:roles[ ]
+        style membership.partnerRel.contact:roles fill:#99bcdb,stroke:white
 
-        perm:coopAssetsTransaction:INSERT{{coopAssetsTransaction:INSERT}}
-        perm:coopAssetsTransaction:UPDATE{{coopAssetsTransaction:UPDATE}}
-        perm:coopAssetsTransaction:SELECT{{coopAssetsTransaction:SELECT}}
+        role:membership.partnerRel.contact:OWNER[[membership.partnerRel.contact:OWNER]]
+        role:membership.partnerRel.contact:ADMIN[[membership.partnerRel.contact:ADMIN]]
+        role:membership.partnerRel.contact:REFERRER[[membership.partnerRel.contact:REFERRER]]
+    end
+end
+
+subgraph membership.partnerRel.holderPerson["`**membership.partnerRel.holderPerson**`"]
+    direction TB
+    style membership.partnerRel.holderPerson fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph membership.partnerRel.holderPerson:roles[ ]
+        style membership.partnerRel.holderPerson:roles fill:#99bcdb,stroke:white
+
+        role:membership.partnerRel.holderPerson:OWNER[[membership.partnerRel.holderPerson:OWNER]]
+        role:membership.partnerRel.holderPerson:ADMIN[[membership.partnerRel.holderPerson:ADMIN]]
+        role:membership.partnerRel.holderPerson:REFERRER[[membership.partnerRel.holderPerson:REFERRER]]
     end
 end
 
diff --git a/src/main/resources/db/changelog/6-hs-booking/601-booking-item/6013-hs-booking-item-rbac.md b/src/main/resources/db/changelog/6-hs-booking/601-booking-item/6013-hs-booking-item-rbac.md
index 25b45a58..7ba21f5c 100644
--- a/src/main/resources/db/changelog/6-hs-booking/601-booking-item/6013-hs-booking-item-rbac.md
+++ b/src/main/resources/db/changelog/6-hs-booking/601-booking-item/6013-hs-booking-item-rbac.md
@@ -6,20 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph debitorRel["`**debitorRel**`"]
-    direction TB
-    style debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph debitorRel:roles[ ]
-        style debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:debitorRel:OWNER[[debitorRel:OWNER]]
-        role:debitorRel:ADMIN[[debitorRel:ADMIN]]
-        role:debitorRel:AGENT[[debitorRel:AGENT]]
-        role:debitorRel:TENANT[[debitorRel:TENANT]]
-    end
-end
-
 subgraph bookingItem["`**bookingItem**`"]
     direction TB
     style bookingItem fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -43,6 +29,20 @@ subgraph bookingItem["`**bookingItem**`"]
     end
 end
 
+subgraph debitorRel["`**debitorRel**`"]
+    direction TB
+    style debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph debitorRel:roles[ ]
+        style debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:debitorRel:OWNER[[debitorRel:OWNER]]
+        role:debitorRel:ADMIN[[debitorRel:ADMIN]]
+        role:debitorRel:AGENT[[debitorRel:AGENT]]
+        role:debitorRel:TENANT[[debitorRel:TENANT]]
+    end
+end
+
 %% granting roles to roles
 role:global:ADMIN -.-> role:debitorRel:OWNER
 role:debitorRel:OWNER -.-> role:debitorRel:ADMIN
diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-CLOUD_SERVER.md b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-CLOUD_SERVER.md
index 56b4a6cd..6a9497ad 100644
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-CLOUD_SERVER.md
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-CLOUD_SERVER.md
@@ -6,34 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
-    direction TB
-    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem.debitorRel:roles[ ]
-        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
-        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
-        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
-        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
-    end
-end
-
-subgraph bookingItem["`**bookingItem**`"]
-    direction TB
-    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem:roles[ ]
-        style bookingItem:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem:OWNER[[bookingItem:OWNER]]
-        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
-        role:bookingItem:AGENT[[bookingItem:AGENT]]
-        role:bookingItem:TENANT[[bookingItem:TENANT]]
-    end
-end
-
 subgraph asset["`**asset**`"]
     direction TB
     style asset fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -56,6 +28,34 @@ subgraph asset["`**asset**`"]
     end
 end
 
+subgraph bookingItem["`**bookingItem**`"]
+    direction TB
+    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem:roles[ ]
+        style bookingItem:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem:OWNER[[bookingItem:OWNER]]
+        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
+        role:bookingItem:AGENT[[bookingItem:AGENT]]
+        role:bookingItem:TENANT[[bookingItem:TENANT]]
+    end
+end
+
+subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
+    direction TB
+    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem.debitorRel:roles[ ]
+        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
+        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
+        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
+        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
+    end
+end
+
 subgraph parentServer["`**parentServer**`"]
     direction TB
     style parentServer fill:#99bcdb,stroke:#274d6e,stroke-width:8px
diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_SERVER.md b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_SERVER.md
index c70c6bbe..660881b6 100644
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_SERVER.md
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_SERVER.md
@@ -6,34 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
-    direction TB
-    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem.debitorRel:roles[ ]
-        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
-        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
-        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
-        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
-    end
-end
-
-subgraph bookingItem["`**bookingItem**`"]
-    direction TB
-    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem:roles[ ]
-        style bookingItem:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem:OWNER[[bookingItem:OWNER]]
-        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
-        role:bookingItem:AGENT[[bookingItem:AGENT]]
-        role:bookingItem:TENANT[[bookingItem:TENANT]]
-    end
-end
-
 subgraph asset["`**asset**`"]
     direction TB
     style asset fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -56,6 +28,34 @@ subgraph asset["`**asset**`"]
     end
 end
 
+subgraph bookingItem["`**bookingItem**`"]
+    direction TB
+    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem:roles[ ]
+        style bookingItem:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem:OWNER[[bookingItem:OWNER]]
+        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
+        role:bookingItem:AGENT[[bookingItem:AGENT]]
+        role:bookingItem:TENANT[[bookingItem:TENANT]]
+    end
+end
+
+subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
+    direction TB
+    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem.debitorRel:roles[ ]
+        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
+        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
+        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
+        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
+    end
+end
+
 subgraph parentServer["`**parentServer**`"]
     direction TB
     style parentServer fill:#99bcdb,stroke:#274d6e,stroke-width:8px
diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_WEBSPACE.md b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_WEBSPACE.md
index c052618a..e9b929a9 100644
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_WEBSPACE.md
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac-MANAGED_WEBSPACE.md
@@ -6,34 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
-    direction TB
-    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem.debitorRel:roles[ ]
-        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
-        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
-        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
-        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
-    end
-end
-
-subgraph bookingItem["`**bookingItem**`"]
-    direction TB
-    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem:roles[ ]
-        style bookingItem:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem:OWNER[[bookingItem:OWNER]]
-        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
-        role:bookingItem:AGENT[[bookingItem:AGENT]]
-        role:bookingItem:TENANT[[bookingItem:TENANT]]
-    end
-end
-
 subgraph asset["`**asset**`"]
     direction TB
     style asset fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -56,6 +28,34 @@ subgraph asset["`**asset**`"]
     end
 end
 
+subgraph bookingItem["`**bookingItem**`"]
+    direction TB
+    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem:roles[ ]
+        style bookingItem:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem:OWNER[[bookingItem:OWNER]]
+        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
+        role:bookingItem:AGENT[[bookingItem:AGENT]]
+        role:bookingItem:TENANT[[bookingItem:TENANT]]
+    end
+end
+
+subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
+    direction TB
+    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem.debitorRel:roles[ ]
+        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
+        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
+        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
+        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
+    end
+end
+
 subgraph parentServer["`**parentServer**`"]
     direction TB
     style parentServer fill:#99bcdb,stroke:#274d6e,stroke-width:8px
diff --git a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.md b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.md
index 127dfac0..16f3b8a2 100644
--- a/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.md
+++ b/src/main/resources/db/changelog/7-hs-hosting/701-hosting-asset/7013-hs-hosting-asset-rbac.md
@@ -6,34 +6,6 @@ This code generated was by RbacViewMermaidFlowchartGenerator, do not amend manua
 %%{init:{'flowchart':{'htmlLabels':false}}}%%
 flowchart TB
 
-subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
-    direction TB
-    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem.debitorRel:roles[ ]
-        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
-        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
-        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
-        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
-    end
-end
-
-subgraph bookingItem["`**bookingItem**`"]
-    direction TB
-    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
-
-    subgraph bookingItem:roles[ ]
-        style bookingItem:roles fill:#99bcdb,stroke:white
-
-        role:bookingItem:OWNER[[bookingItem:OWNER]]
-        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
-        role:bookingItem:AGENT[[bookingItem:AGENT]]
-        role:bookingItem:TENANT[[bookingItem:TENANT]]
-    end
-end
-
 subgraph asset["`**asset**`"]
     direction TB
     style asset fill:#dd4901,stroke:#274d6e,stroke-width:8px
@@ -56,6 +28,34 @@ subgraph asset["`**asset**`"]
     end
 end
 
+subgraph bookingItem["`**bookingItem**`"]
+    direction TB
+    style bookingItem fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem:roles[ ]
+        style bookingItem:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem:OWNER[[bookingItem:OWNER]]
+        role:bookingItem:ADMIN[[bookingItem:ADMIN]]
+        role:bookingItem:AGENT[[bookingItem:AGENT]]
+        role:bookingItem:TENANT[[bookingItem:TENANT]]
+    end
+end
+
+subgraph bookingItem.debitorRel["`**bookingItem.debitorRel**`"]
+    direction TB
+    style bookingItem.debitorRel fill:#99bcdb,stroke:#274d6e,stroke-width:8px
+
+    subgraph bookingItem.debitorRel:roles[ ]
+        style bookingItem.debitorRel:roles fill:#99bcdb,stroke:white
+
+        role:bookingItem.debitorRel:OWNER[[bookingItem.debitorRel:OWNER]]
+        role:bookingItem.debitorRel:ADMIN[[bookingItem.debitorRel:ADMIN]]
+        role:bookingItem.debitorRel:AGENT[[bookingItem.debitorRel:AGENT]]
+        role:bookingItem.debitorRel:TENANT[[bookingItem.debitorRel:TENANT]]
+    end
+end
+
 subgraph parentServer["`**parentServer**`"]
     direction TB
     style parentServer fill:#99bcdb,stroke:#274d6e,stroke-width:8px