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 0ed6ce7b2..3d72e39b6 100644
--- a/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/cachedtest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 5394a74b4..bf8be4efc 100644
--- a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 45d20b677..60716f8c0 100644
--- a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 5394a74b4..bf8be4efc 100644
--- a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 5394a74b4..bf8be4efc 100644
--- a/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/transactionaltest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 1b64ae333..b732cb3ef 100644
--- a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml
+++ b/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeModel.xml
@@ -23,7 +23,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 0ed6ce7b2..3d72e39b6 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
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 bad34f118..a4be398b1 100644
--- a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
+++ b/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
@@ -57,9 +57,6 @@
 	</Users>
 
 	<Roles>
-
-		<Role name="PrivilegeAdmin" />
-
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 875b9c5af..462ab3f10 100644
--- a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeModel.xml
@@ -21,7 +21,46 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
+		<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 0ed6ce7b2..3d72e39b6 100644
--- a/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/svctest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 45d20b677..60716f8c0 100644
--- a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/transienttest/config/PrivilegeModel.xml
@@ -21,7 +21,6 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 997ed3810..acc57fc44 100644
--- a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
+++ b/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeModel.xml
@@ -58,7 +58,7 @@
 	</Users>
 
 	<Roles>
-		<Role name="PrivilegeAdmin" />
+
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
diff --git a/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml b/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
index dd2a01565..6c211174d 100644
--- a/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
+++ b/li.strolch.tutorialapp/src/runtime/config/PrivilegeModel.xml
@@ -58,8 +58,6 @@
 
 	<Roles>
 
-		<Role name="PrivilegeAdmin" />
-
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>
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 d320e705f..9a3c4256c 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
@@ -58,8 +58,6 @@
 
 	<Roles>
 
-		<Role name="PrivilegeAdmin" />
-
 		<Role name="agent">
 			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
 				<AllAllowed>true</AllAllowed>