diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_0_1.json b/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_0_1.json
new file mode 100644
index 0000000000000000000000000000000000000000..e58c3a047f2af5192ad6d3d7922db06f1828fdc7
--- /dev/null
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_0_1.json
@@ -0,0 +1,5 @@
+{
+	"name": "Abtl. 10.0.1 Versammlungsbehörde, Identitätsfeststellung, Fundbüro",
+	"path": "/Abtl. 10.0.1 Versammlungsbehörde, Identitätsfeststellung, Fundbüro",
+	"attributes": {"organisationseinheitId": ["9030229"]}
+}
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_5_1_2.json b/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_5_1_2.json
new file mode 100644
index 0000000000000000000000000000000000000000..523fdd257bc8dd4bdc3be7599ca5c3f1b0f44d9e
--- /dev/null
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/group/abtl-10_5_1_2.json
@@ -0,0 +1,5 @@
+{
+	"name": "Abtl. 10.5.1.2 Allgemeine Gefahrenabwehr und sonstige Ordnungsrechtsangelegenheiten",
+	"path": "/Abtl. 10.5.1.2 Allgemeine Gefahrenabwehr und sonstige Ordnungsrechtsangelegenheiten",
+	"attributes": {"organisationseinheitId": ["10363455"]}
+}
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
index b5e05e2c6fb04d863475bc9bd81f9c3379484528..0b284ad00095198d151c3e9e8865e891c9a649dc 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json
@@ -6,5 +6,5 @@
 	"fullName": "Emil Ernst",
 	"initials": "EE",
 	"dataTestId": "Emil_Ernst",
-	"einheitlicherAnsprechpartner": true
+	"realmRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json
index c5d1fad187108c1f26eeb2a8649b1ec0aefe7ebd..22f78e014b70157a4d6d26ba3604e7affcf06fc9 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kfinder.json
@@ -1,4 +1,5 @@
 {
 	"name": "kfinder",
-	"password": "Katrinfinder"
+	"password": "Katrinfinder",
+	"groups": ["Abtl. 10.0.1 Versammlungsbehörde, Identitätsfeststellung, Fundbüro"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json
index 408b2533066851a002daab1a045d2cd8bdc8c6a6..f1f4ebbbea2ffe18d2118a52470cf2b17be2a6ae 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_kordner.json
@@ -1,4 +1,5 @@
 {
 	"name": "kordner",
-	"password": "Klausordner"
+	"password": "Klausordner",
+	"groups": ["Abtl. 10.5.1.2 Allgemeine Gefahrenabwehr und sonstige Ordnungsrechtsangelegenheiten"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
index 65897a1c189a162f6d6fbe45a171231f836ed892..5508c08d0bca9fc6b256caee3881373c9fb8f914 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_sabine.json
@@ -1,5 +1,4 @@
 {
-	"uuid": "df385159-6055-4169-bb78-f5c6f60fe0cf",
 	"name": "sabine",
 	"password": "SuperCreativ",
 	"firstName": "Sabine",
@@ -7,5 +6,5 @@
 	"fullName": "Sabine Solala",
 	"initials": "SS",
 	"dataTestId": "Sabine_Solala",
-	"verwaltungUser": true
+	"realmRoles": ["VERWALTUNG_USER"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
index eab922b306de631007bd71bbf2615f2fa61ce6c0..21efc90fa0043eeed0e328dc14640082300bd6d9 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_zonk.json
@@ -1,5 +1,5 @@
 {
 	"name": "zonk",
 	"password": "Zonk4Nothing",
-	"verwaltungUser": true
+	"realmRoles": ["VERWALTUNG_USER"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail-error.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail-error.e2e-spec.ts
index f530256b6057d6cd5aa930560f385fc2ba134fc7..0647ad6084da99f4a3aa9750c367ccd61f86388f 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail-error.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail-error.e2e-spec.ts
@@ -27,7 +27,7 @@ describe('PostfachMail error', () => {
 	const vorgang: VorgangE2E = createVorgang();
 	const postfachMailItem: PostfachMailItemE2E = {
 		...createPostfachNachrichtReplyItem(),
-		createdBy: getUserSabine().uuid,
+		createdBy: Cypress.env("sabineUuid"),
 		direction: DirectionE2E.OUT,
 		sentAt: '2022-12-02T15:00:00.790Z[UTC]',
 		sentSuccessful: false,
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-zurueckstellen.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-zurueckstellen.e2e-spec.ts
index 60f369f36848f3f0e3e88918e7176a898f2bdc3a..d42287fb637cbb5167686343735f4d3069736abe 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-zurueckstellen.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-zurueckstellen.e2e-spec.ts
@@ -22,7 +22,7 @@ describe('Vorgang Zurueckstellen', () => {
 	const vorgangPage: VorgangPage = new VorgangPage();
 	const userContainer: UserProfileE2EComponent = vorgangPage.getVorgangDetailHeader().getUserContainer();
 
-	const vorgangZurueckstellen: VorgangE2E = { ...createVorgang(), name: 'DoBescheiden', status: VorgangStatusE2E.IN_BEARBEITUNG, assignedTo: getUserSabine().uuid };
+	const vorgangZurueckstellen: VorgangE2E = { ...createVorgang(), name: 'DoBescheiden', status: VorgangStatusE2E.IN_BEARBEITUNG, assignedTo: Cypress.env("sabineUuid") };
 	const vorgangZurueckstellenRevoke: VorgangE2E = { ...buildVorgang(objectIds[0], 'DoRevokeBescheiden'), status: VorgangStatusE2E.IN_BEARBEITUNG };
 
 	before(() => {