diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index a51a8acfec469004bbcf0bb5c809324ac9677baa..f4873456d347c5ed937abb82a5ab8df24784c583 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -10,7 +10,7 @@ kind: OzgKeycloakClient
 metadata:
   name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
   namespace: {{ include "app.namespace" $ }}
-{{- if $client.ozgcloudOperator }}
+{{- if $client.kopOperator }}
   annotations:
     "helm.sh/resource-policy": keep
 {{- end }}
diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index 03c7f33b81079702c4c6661c29c821023119bfad..38593ecf9dec8944c2553a2d03d266dd055e4ed5 100644
--- a/src/main/helm/templates/keycloak-user-crd.yaml
+++ b/src/main/helm/templates/keycloak-user-crd.yaml
@@ -1,8 +1,8 @@
 {{ range $user := concat (.Values.sso.api_users | default list) (.Values.sso.keycloak_users | default list) }}
 ---
-{{- if $user.ozgcloudOperator }}
-apiVersion: api.ozgcloud-stack.de/v1
-kind: OzgcloudKeycloakUser
+{{- if $user.kopOperator }}
+apiVersion: api.kop-stack.de/v1
+kind: KopKeycloakUser
 {{- else }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgKeycloakUser
@@ -10,7 +10,7 @@ kind: OzgKeycloakUser
 metadata:
   name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
   namespace: {{ include "app.namespace" $ }}
-{{- if $user.ozgcloudOperator }}
+{{- if $user.kopOperator }}
   annotations:
     "helm.sh/resource-policy": keep
 {{- end }}
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index 413f27759528671e8c280f661388c582415af1c9..b1a89c21786809e5884a8acc61f31c41a08e117a 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -51,12 +51,12 @@ tests:
       - equal:
           path: metadata.namespace
           value: by-helm-test
-  - it: should contain header data for ozgcloudOperator
+  - it: should contain header data for kopOperator
     set:
       sso:
          keycloak_clients:
            - client_name: alfa
-             ozgcloudOperator: true
+             kopOperator: true
     asserts:
       - isAPIVersion:
           of: api.ozgcloud-stack.de/v1
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index e9f8c71a7c07107f22803f3e95df6d88d48ceb06..8d33dc1f26ebd8eb6a98f5c41ca13f2973be168e 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -541,8 +541,8 @@ tests:
         environment: test
       sso:
         keycloak_users:
-          - name: ozgcloud
-            ozgcloudOperator: true
+          - name: kop
+            kopOperator: true
     asserts:
       - isAPIVersion:
           of: api.ozgcloud-stack.de/v1