diff --git a/Jenkinsfile b/Jenkinsfile
index 3b86a6e609c09ec802be38673f77c61a81584091..0f538540d750dc76f3bfb88e909383090efd9ccb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -425,8 +425,8 @@ Void generateKeycloakUserYaml(String namespace) {
        	    newUserYaml.spec.user.lastName = userJson.lastName
         }
 
-        if(userJson.realmRoles) {
-            newUserYaml.spec.user.realmRoles += userJson.realmRoles
+        if(userJson.clientRoles) {
+            newUserYaml.spec.user.clientRoles = [namespace+"-goofy": userJson.clientRoles]
         }
 
 		if(userJson.groups) {
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 0b284ad00095198d151c3e9e8865e891c9a649dc..88c3037b16758d05c6251a3a007993291980cecd 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",
-	"realmRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
+	"clientRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
 }
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
index 3cceba561f8992bd059312ee3accf0edbb30856d..c2a6a8b4b38f545f635bc34ba7743169f7d5bff8 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/user/user_peter.json
@@ -3,5 +3,5 @@
 	"password": "Y9nk43yrQ_zzIPpfFU-I",
 	"firstName": "Peter",
 	"lastName": "von der Post",
-	"realmRoles": ["VERWALTUNG_POSTSTELLE"]
+	"clientRoles": ["VERWALTUNG_POSTSTELLE"]
 }
\ 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 011c6fd50fa6bb91dbee12b7103f207cf936536e..98eea79ac9c3da6b3caeb9de1959a5b454f7d781 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
@@ -6,6 +6,6 @@
 	"fullName": "Sabine Solala",
 	"initials": "SS",
 	"dataTestId": "Sabine_Solala",
-	"realmRoles": ["VERWALTUNG_USER"],
+	"clientRoles": ["VERWALTUNG_USER"],
 	"groups": ["E2E Tests"]
 }
\ 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 21efc90fa0043eeed0e328dc14640082300bd6d9..3a7afe8144c75b8a53728b6cc6a10b095814e689 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",
-	"realmRoles": ["VERWALTUNG_USER"]
+	"clientRoles": ["VERWALTUNG_USER"]
 }
\ No newline at end of file