diff --git a/src/main/helm/templates/keycloak_client_crd.yaml b/src/main/helm/templates/keycloak_client_crd.yaml
index 5b0a6f895418a3ba333a2d6d0e83ec102b1ccd6d..e64622d0f5b3de937af5db02e420d8559c33dead 100644
--- a/src/main/helm/templates/keycloak_client_crd.yaml
+++ b/src/main/helm/templates/keycloak_client_crd.yaml
@@ -1,20 +1,11 @@
 {{- if not (.Values.sso).disableOzgOperator -}}
 {{ range $client := (.Values.sso).keycloak_clients }}
 ---
-{{- if $client.kopOperator }}
-apiVersion: api.kop-stack.de/v1
-kind: KopKeycloakClient
-{{- else }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakClient
-{{- end }}
 metadata:
   name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
   namespace: {{ include "app.namespace" $ }}
-{{- if $client.kopOperator }}
-  annotations:
-    "helm.sh/resource-policy": keep
-{{- end }}
 spec:
   keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
   client_name: {{ $client.client_name }}
diff --git a/src/main/helm/templates/keycloak_user_crd.yaml b/src/main/helm/templates/keycloak_user_crd.yaml
index 2901efba99a56a551ce2fa0276e15e14440917b2..0f5470b0bc15c04d09993fcfb6082278b08fca2c 100644
--- a/src/main/helm/templates/keycloak_user_crd.yaml
+++ b/src/main/helm/templates/keycloak_user_crd.yaml
@@ -1,20 +1,11 @@
 {{- if not (.Values.sso).disableOzgOperator -}}
 {{ range $user := concat ((.Values.sso).api_users | default list) ((.Values.sso).keycloak_users | default list) }}
 ---
-{{- if $user.kopOperator }}
-apiVersion: api.kop-stack.de/v1
-kind: KopKeycloakUser
-{{- else }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgCloudKeycloakUser
-{{- end }}
 metadata:
   name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
   namespace: {{ include "app.namespace" $ }}
-{{- if $user.kopOperator }}
-  annotations:
-    "helm.sh/resource-policy": keep
-{{- end }}
 spec:
   keep_after_delete: {{ $.Values.sso.keep_after_delete | default false }}
   update_user: {{ $user.update_user | default false }}
diff --git a/src/test/helm/keycloak_client_crd_test.yaml b/src/test/helm/keycloak_client_crd_test.yaml
index 17f2249b721a1eab8b7d279233ef8a5ed41d5d3a..f84ce1e3dbcf74623c939941d8115d099a7f4cbb 100644
--- a/src/test/helm/keycloak_client_crd_test.yaml
+++ b/src/test/helm/keycloak_client_crd_test.yaml
@@ -58,29 +58,6 @@ tests:
       - equal:
           path: metadata.namespace
           value: by-helm-test
-  - it: should contain header data for kopOperator
-    set:
-      baseUrl: "test.by.ozg-cloud.de"
-      sso:
-         keycloak_clients:
-           - client_name: alfa
-             kopOperator: true
-    asserts:
-      - isAPIVersion:
-          of: api.kop-stack.de/v1
-      - isKind:
-          of: KopKeycloakClient
-  - it: should have annotations for kopOperator
-    set:
-      baseUrl: "test.by.ozg-cloud.de"
-      sso:
-        keycloak_clients:
-          - client_name: alfa
-            kopOperator: true
-    asserts:
-      - equal:
-          path: metadata.annotations["helm.sh/resource-policy"]
-          value: keep
   - it: should have default Values
     set:
       baseUrl: test.by.ozg-cloud.de
diff --git a/src/test/helm/keycloak_user_crd_test.yaml b/src/test/helm/keycloak_user_crd_test.yaml
index 97d1116c82fd20e8cc871cb6e26eb8042718ce76..2b8857fca6d3374234f1cd962b576eaedb12b1f8 100644
--- a/src/test/helm/keycloak_user_crd_test.yaml
+++ b/src/test/helm/keycloak_user_crd_test.yaml
@@ -533,28 +533,6 @@ tests:
       - isNull:
           path: spec.keycloak_user.client_roles
 
-  - it: should use kopOperator
-    set:
-      ozgcloud:
-        bundesland: by
-        bezeichner: helm
-        environment: test
-      sso:
-        keycloak_users:
-          - name: kop
-            kopOperator: true
-    asserts:
-      - isAPIVersion:
-          of: api.kop-stack.de/v1
-      - isKind:
-          of: KopKeycloakUser
-      - equal:
-          path: spec.keycloak_user.username
-          value: kop
-      - equal:
-          path: metadata.annotations["helm.sh/resource-policy"]
-          value: keep
-
   - it: should not create user cr if ozg operator is disabled
     set:
       sso: