diff --git a/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml
index bf8be4efc..d2a6ec7f5 100644
--- a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml
index 60716f8c0..e67cc8b8c 100644
--- a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml
index bf8be4efc..d2a6ec7f5 100644
--- a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml
index bf8be4efc..d2a6ec7f5 100644
--- a/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml
index b732cb3ef..f6e73eeab 100644
--- a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml
@@ -16,7 +16,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/config/PrivilegeModel.xml b/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/cachedruntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeModel.xml b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.postgresql/src/test/resources/transactionalruntime/config/PrivilegeModel.xml b/li.strolch.persistence.postgresql/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.postgresql/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.postgresql/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedruntime/config/PrivilegeModel.xml b/li.strolch.persistence.xml/src/test/resources/cachedruntime/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.xml/src/test/resources/cachedruntime/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.xml/src/test/resources/cachedruntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeModel.xml b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.persistence.xml/src/test/resources/transactionalruntime/config/PrivilegeModel.xml b/li.strolch.persistence.xml/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.persistence.xml/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
+++ b/li.strolch.persistence.xml/src/test/resources/transactionalruntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
index a4be398b1..c1f488346 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 			<Properties>
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml
index 462ab3f10..7e355c30f 100644
--- a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml
@@ -14,53 +14,12 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin">
-			<Privilege name="PrivilegeAction" policy="DefaultPrivilege">
-				<Allow>Persist</Allow>
-				<Allow>Reload</Allow>
-				<Allow>GetPolicies</Allow>
-			</Privilege>
-
-			<Privilege name="PrivilegeGetRole" policy="RoleAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeAddRole" policy="RoleAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeRemoveRole" policy="RoleAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeModifyRole" policy="RoleAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-
-			<Privilege name="PrivilegeGetUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeAddUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeRemoveUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeModifyUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeAddRoleToUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="PrivilegeRemoveRoleFromUser" policy="UserAccessPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-		</Role>
-
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml b/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml
index 3d72e39b6..e332cb1bc 100644
--- a/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml
index 60716f8c0..e67cc8b8c 100644
--- a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 		</User>
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
index acc57fc44..db193c4f2 100644
--- a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
@@ -15,7 +15,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 			<Properties>
diff --git a/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml b/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
index 6c211174d..8900c354b 100644
--- a/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
+++ b/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 			<Properties>
diff --git a/li.strolch.tutorialwebapp/src/main/webapp/WEB-INF/config/PrivilegeModel.xml b/li.strolch.tutorialwebapp/src/main/webapp/WEB-INF/config/PrivilegeModel.xml
index 9a3c4256c..b50ec1f7a 100644
--- a/li.strolch.tutorialwebapp/src/main/webapp/WEB-INF/config/PrivilegeModel.xml
+++ b/li.strolch.tutorialwebapp/src/main/webapp/WEB-INF/config/PrivilegeModel.xml
@@ -14,7 +14,6 @@
 			<State>ENABLED</State>
 			<Locale>en_GB</Locale>
 			<Roles>
-				<Role>PrivilegeAdmin</Role>
 				<Role>AppUser</Role>
 			</Roles>
 			<Properties>