diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index f4873456d347c5ed937abb82a5ab8df24784c583..1e5509d9114b14284a7e5f49361332832cff0107 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -1,8 +1,8 @@
 {{ range $client := .Values.sso.keycloak_clients }}
 ---
-{{- if $client.ozgcloudOperator }}
-apiVersion: api.ozgcloud-stack.de/v1
-kind: OzgcloudKeycloakClient
+{{- if $client.kopOperator }}
+apiVersion: api.kop-stack.de/v1
+kind: KopKeycloakClient
 {{- else }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgKeycloakClient
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index b1a89c21786809e5884a8acc61f31c41a08e117a..4b929a7c1de225ef193472fcfab732f0b16d2280 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -59,15 +59,15 @@ tests:
              kopOperator: true
     asserts:
       - isAPIVersion:
-          of: api.ozgcloud-stack.de/v1
+          of: api.kop-stack.de/v1
       - isKind:
-          of: OzgcloudKeycloakClient
-  - it: should have annotations for ozgcloudOperator
+          of: KopKeycloakClient
+  - it: should have annotations for kopOperator
     set:
       sso:
         keycloak_clients:
           - client_name: alfa
-            ozgcloudOperator: true
+            kopOperator: true
     asserts:
       - equal:
           path: metadata.annotations.[helm.sh/resource-policy]
@@ -225,7 +225,7 @@ tests:
     asserts:
       - equal:
           path: spec.protocol_mappers
-          value: 
+          value:
             - name: organisationseinheitIdMapper
               protocol: openid-connect
               protocolMapper: oidc-usermodel-attribute-mapper
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index edd408de92902aca32cf47f3ef85d2b1c8474055..d2a2cf7da26608830ac5199401d2da1619ebbac5 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -545,12 +545,12 @@ tests:
             kopOperator: true
     asserts:
       - isAPIVersion:
-          of: api.ozgcloud-stack.de/v1
+          of: api.kop-stack.de/v1
       - isKind:
-          of: OzgcloudKeycloakUser
+          of: KopKeycloakUser
       - equal:
           path: spec.keycloak_user.username
-          value: ozgcloud
+          value: kop
       - equal:
           path: metadata.annotations.[helm.sh/resource-policy]
           value: keep
\ No newline at end of file